From ea0cf659b0f193883c9326f50092b9d6f758151f Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 13 Dec 2018 11:40:41 +0300 Subject: [PATCH] AbstractMultiPlatformIntegrationTest: search stdlib-common in dist --- .../multiplatform/AbstractMultiPlatformIntegrationTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt index 0ad417e7cc2..6069bda6bee 100644 --- a/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt @@ -92,6 +92,9 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() { private fun findStdlibCommon(): File { // Take kotlin-stdlib-common.jar from dist/ when it's there + val fromDist = File("dist/kotlinc/lib/kotlin-stdlib-common.jar") + if (fromDist.isFile) return fromDist + val stdlibCommonLibsDir = "libraries/stdlib/common/build/libs" val commonLibs = Files.newDirectoryStream(Paths.get(stdlibCommonLibsDir)).use(Iterable::toList) return commonLibs.sorted().findLast {