From eec5f99e3593c6f4571f142d12086af3b91a779a Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 9 Aug 2021 09:24:50 +0200 Subject: [PATCH] [Gradle] Support 'KONAN_DATA_DIR' in Commonizer tests --- .../gradle/util/reportSourceSetCommonizerDependencies.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/reportSourceSetCommonizerDependencies.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/reportSourceSetCommonizerDependencies.kt index 0cc4ae7378f..b6cfaf838c7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/reportSourceSetCommonizerDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/reportSourceSetCommonizerDependencies.kt @@ -39,10 +39,13 @@ data class SourceSetCommonizerDependencies( } fun onlyNativeDistribution(): SourceSetCommonizerDependencies { + val konanDataDir = System.getenv("KONAN_DATA_DIR")?.let(::File) + return SourceSetCommonizerDependencies( sourceSetName, dependencies.filter { dependency -> - dependency.file.allParents.any { parentFile -> parentFile.name == ".konan" } + (if (konanDataDir != null) dependency.file.startsWith(konanDataDir) else false) || + dependency.file.allParents.any { parentFile -> parentFile.name == ".konan" } }.toSet() ) }