fixup! [Build] Make :tools:binary-compatibility-validator:test cacheable
diff --git a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml index ad5b33e..4443fc8 100644 --- a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml +++ b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
@@ -4,7 +4,7 @@ <option name="executionName" /> <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/binary-compatibility-validator" /> <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" value="-Poverwrite.output=true" /> + <option name="scriptParameters" value="-Poverwrite.output=true -Pkotlin.test.instrumentation.disable.inputs.check=true" /> <option name="taskDescriptions"> <list /> </option>
diff --git a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator_w_Native__overwrite_results.xml b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator_w_Native__overwrite_results.xml index bfa0d48..a961c9c 100644 --- a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator_w_Native__overwrite_results.xml +++ b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator_w_Native__overwrite_results.xml
@@ -4,7 +4,7 @@ <option name="executionName" /> <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/binary-compatibility-validator" /> <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" value="-Poverwrite.output=true -Pkotlin.native.enabled=true" /> + <option name="scriptParameters" value="-Poverwrite.output=true -Pkotlin.native.enabled=true -Pkotlin.test.instrumentation.disable.inputs.check=true" /> <option name="taskDescriptions"> <list /> </option>
diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/KlibPublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/KlibPublicAPITest.kt index 7d488b7..0af7f29 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/KlibPublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/KlibPublicAPITest.kt
@@ -9,6 +9,7 @@ import kotlinx.validation.ExperimentalBCVApi import kotlinx.validation.api.klib.* +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.junit.Assume import java.io.File import kotlin.io.path.* @@ -76,7 +77,7 @@ } private fun mergeAndCompare(apiFileBaseName: String, dump: KlibDump) { - val mergedDumpFile = File("klib-public-api").resolve("$apiFileBaseName.api") + val mergedDumpFile = ForTestCompileRuntime.getFileFromProperty("klib-public-api").resolve("$apiFileBaseName.api") if (!mergedDumpFile.exists()) { mergedDumpFile.toPath().createParentDirectories() dump.saveTo(mergedDumpFile)
diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt index 90a0235..661b22d 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt
@@ -8,6 +8,7 @@ import kotlinx.validation.api.filterOutAnnotated import kotlinx.validation.api.filterOutNonPublic import kotlinx.validation.api.loadApiFromJvmClasses +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.junit.Rule import org.junit.Test import org.junit.rules.TestName @@ -52,7 +53,7 @@ .filterOutNonPublic(nonPublicPackages) .filterOutAnnotated(nonPublicAnnotations.toSet()) - val target = File("reference-public-api") + val target = ForTestCompileRuntime.getFileFromProperty("reference-public-api") .resolve(testName.methodName.replaceCamelCaseWithDashedLowerCase() + ".txt") api.dumpAndCompareWith(target)