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

Modularized tests. Remove obsolete use_build_file switch

Browse Source 
^KT-56075
This commit is contained in:
Simon Ogorodnik
2023-01-25 14:52:58 +01:00
committed by Space Team
parent 1bb5635570
commit 83ead8fb6f
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
+1 -15
View File
@@ -22,7 +22,6 @@ import java.io.PrintStream
import java.nio.file.Files
import java.nio.file.Path
private val USE_BUILD_FILE: Boolean = System.getProperty("fir.bench.use.build.file", "true").toBooleanLenient()!!
private val JVM_TARGET: String = System.getProperty("fir.bench.jvm.target", "1.8")
abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
@@ -132,20 +131,7 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
args.reportPerf = true
args.jvmTarget = JVM_TARGET
args.allowKotlinPackage = true
if (USE_BUILD_FILE) {
configureArgsUsingBuildFile(args, moduleData, tmp)
} else {
configureRegularArgs(args, moduleData, tmp)
}
}
private fun configureRegularArgs(args: K2JVMCompilerArguments, moduleData: ModuleData, tmp: Path) {
args.classpath = moduleData.classpath.joinToString(separator = ":") { it.absolutePath }
args.javaSourceRoots = moduleData.javaSourceRoots.map { it.path.absolutePath }.toTypedArray()
args.freeArgs = moduleData.sources.map { it.absolutePath }
args.destination = tmp.toAbsolutePath().toFile().toString()
args.friendPaths = moduleData.friendDirs.map { it.canonicalPath }.toTypedArray()
args.optIn = moduleData.optInAnnotations.toTypedArray()
configureArgsUsingBuildFile(args, moduleData, tmp)
}
private fun configureArgsUsingBuildFile(args: K2JVMCompilerArguments, moduleData: ModuleData, tmp: Path) {