[K/N][tests] Fixed CachesAutoBuildTest

In auto-cache mode, the compiler itself chooses the system cache directory, and it is important to not pass it explicitly.
JetBrains · Aug 11, 2023 · d3b8607 · d3b8607
1 parent 084479f
commit d3b8607
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CachesAutoBuildTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CachesAutoBuildTest.kt
@@ -82,6 +82,7 @@ class CachesAutoBuildTest : AbstractNativeSimpleTest() {
     private fun compileToExecutable(sourcesDir: File, autoCacheFrom: File, cacheDirectories: List<File>, vararg dependencies: KLIB) =
         compileToExecutable(
             sourcesDir,
+            tryPassSystemCacheDirectory = false, // With auto-cache mode, the compiler chooses the system cache directory itself.
             freeCompilerArgs = TestCompilerArgs(
                 listOf(
                     "-Xauto-cache-from=${autoCacheFrom.absolutePath}",

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeSimpleTestUtils.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeSimpleTestUtils.kt
@@ -78,15 +78,30 @@ internal fun AbstractNativeSimpleTest.cinteropToLibrary(
 
 internal fun AbstractNativeSimpleTest.compileToExecutable(
     sourcesDir: File,
+    tryPassSystemCacheDirectory: Boolean,
     freeCompilerArgs: TestCompilerArgs,
     vararg dependencies: TestCompilationArtifact.KLIB
 ): TestCompilationResult<out TestCompilationArtifact.Executable> {
     val testCase: TestCase = generateTestCaseWithSingleModule(sourcesDir, freeCompilerArgs)
-    return compileToExecutable(testCase, dependencies.map { it.asLibraryDependency() })
+    return compileToExecutable(testCase, tryPassSystemCacheDirectory, dependencies.map { it.asLibraryDependency() })
 }
 
-internal fun AbstractNativeSimpleTest.compileToExecutable(testCase: TestCase, vararg dependencies: TestCompilationDependency<*>) =
-    compileToExecutable(testCase, dependencies.asList())
+internal fun AbstractNativeSimpleTest.compileToExecutable(
+    sourcesDir: File,
+    freeCompilerArgs: TestCompilerArgs,
+    vararg dependencies: TestCompilationArtifact.KLIB
+) = compileToExecutable(sourcesDir, true, freeCompilerArgs, *dependencies)
+
+internal fun AbstractNativeSimpleTest.compileToExecutable(
+    testCase: TestCase,
+    tryPassSystemCacheDirectory: Boolean,
+    vararg dependencies: TestCompilationDependency<*>
+) = compileToExecutable(testCase, tryPassSystemCacheDirectory, dependencies.asList())
+
+internal fun AbstractNativeSimpleTest.compileToExecutable(
+    testCase: TestCase,
+    vararg dependencies: TestCompilationDependency<*>
+) = compileToExecutable(testCase, true, dependencies.asList())
 
 internal fun AbstractNativeSimpleTest.compileToStaticCache(
     klib: TestCompilationArtifact.KLIB,
@@ -188,6 +203,7 @@ private fun AbstractNativeSimpleTest.compileToLibrary(
 
 private fun AbstractNativeSimpleTest.compileToExecutable(
     testCase: TestCase,
+    tryPassSystemCacheDirectory: Boolean,
     dependencies: List<TestCompilationDependency<*>>
 ): TestCompilationResult<out TestCompilationArtifact.Executable> {
     val compilation = ExecutableCompilation(
@@ -196,7 +212,8 @@ private fun AbstractNativeSimpleTest.compileToExecutable(
         sourceModules = testCase.modules,
         extras = testCase.extras,
         dependencies = dependencies,
-        expectedArtifact = getExecutableArtifact()
+        expectedArtifact = getExecutableArtifact(),
+        tryPassSystemCacheDirectory = tryPassSystemCacheDirectory
     )
     return compilation.result
 }

diff --git a/...ests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt b/...ests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt
@@ -269,7 +269,8 @@ internal class ExecutableCompilation(
     sourceModules: Collection<TestModule>,
     private val extras: Extras,
     dependencies: Iterable<TestCompilationDependency<*>>,
-    expectedArtifact: Executable
+    expectedArtifact: Executable,
+    val tryPassSystemCacheDirectory: Boolean = true,
 ) : SourceBasedCompilation<Executable>(
     targets = settings.get(),
     home = settings.get(),
@@ -322,7 +323,9 @@ internal class ExecutableCompilation(
 
     override fun applyDependencies(argsBuilder: ArgsBuilder): Unit = with(argsBuilder) {
         super.applyDependencies(argsBuilder)
-        cacheMode.staticCacheForDistributionLibrariesRootDir?.let { cacheRootDir -> add("-Xcache-directory=$cacheRootDir") }
+        cacheMode.staticCacheForDistributionLibrariesRootDir
+            ?.takeIf { tryPassSystemCacheDirectory }
+            ?.let { cacheRootDir -> add("-Xcache-directory=$cacheRootDir") }
         add(dependencies.uniqueCacheDirs) { libraryCacheDir -> "-Xcache-directory=${libraryCacheDir.path}" }
     }