[IC] Add ability to pass additional compiler args to IC tests

Additional arguments should be declared in `args.txt` file in test
  directory in common CLI arguments format
This commit is contained in:
Dmitriy Novozhilov
2020-11-23 12:38:55 +03:00
committed by TeamCityServer
parent 57a081c399
commit 3246e6b9ac
4 changed files with 73 additions and 6 deletions
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.TestWithWorkingDir
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
import org.jetbrains.kotlin.incremental.testingUtils.*
import org.jetbrains.kotlin.incremental.utils.TestCompilationResult
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
@@ -28,6 +29,10 @@ import java.io.File
abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerArguments> : TestWithWorkingDir() {
protected abstract fun createCompilerArguments(destinationDir: File, testDir: File): Args
private fun createCompilerArgumentsImpl(destinationDir: File, testDir: File): Args = createCompilerArguments(destinationDir, testDir).apply {
parseCommandLineArguments(parseAdditionalArgs(testDir), this)
}
fun doTest(path: String) {
val testDir = File(path)
@@ -40,7 +45,7 @@ abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerAr
val mapWorkingToOriginalFile = HashMap(copyTestSources(testDir, srcDir, filePrefix = ""))
val sourceRoots = listOf(srcDir)
val args = createCompilerArguments(outDir, testDir)
val args = createCompilerArgumentsImpl(outDir, testDir)
val (_, _, errors) = initialMake(cacheDir, sourceRoots, args)
check(errors.isEmpty()) { "Initial build failed: \n${errors.joinToString("\n")}" }
@@ -111,7 +116,7 @@ abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerAr
// todo: also compare caches
val rebuildOutDir = File(workingDir, "rebuild-out").apply { mkdirs() }
val rebuildCacheDir = File(workingDir, "rebuild-cache").apply { mkdirs() }
val rebuildResult = make(rebuildCacheDir, sourceRoots, createCompilerArguments(rebuildOutDir, testDir))
val rebuildResult = make(rebuildCacheDir, sourceRoots, createCompilerArgumentsImpl(rebuildOutDir, testDir))
val rebuildExpectedToSucceed = buildLogSteps.last().compileSucceeded
val rebuildSucceeded = rebuildResult.exitCode == ExitCode.OK
@@ -159,5 +164,16 @@ abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerAr
protected val kotlinStdlibJvm: File = File(distKotlincLib, "kotlin-stdlib.jar").also {
KtUsefulTestCase.assertExists(it)
}
private const val ARGUMENTS_FILE_NAME = "args.txt"
private fun parseAdditionalArgs(testDir: File): List<String> {
return File(testDir, ARGUMENTS_FILE_NAME)
.takeIf { it.exists() }
?.readText()
?.split(" ", "\n")
?.filter { it.isNotBlank() }
?: emptyList()
}
}
}
}