azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AbstractMultiPlatformIntegrationTest: search stdlib-common in dist

Browse Source
This commit is contained in:
Sergey Rostov
2018-12-13 11:40:41 +03:00
parent c6b4117fb9
commit ea0cf659b0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt
+3
View File
@@ -92,6 +92,9 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
private fun findStdlibCommon(): File { private fun findStdlibCommon(): File {
// Take kotlin-stdlib-common.jar from dist/ when it's there // 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 stdlibCommonLibsDir = "libraries/stdlib/common/build/libs"
val commonLibs = Files.newDirectoryStream(Paths.get(stdlibCommonLibsDir)).use(Iterable<Path>::toList) val commonLibs = Files.newDirectoryStream(Paths.get(stdlibCommonLibsDir)).use(Iterable<Path>::toList)
return commonLibs.sorted().findLast { return commonLibs.sorted().findLast {