Modularized tests. Extract common arguments for full-pipeline tests
^KT-56075
This commit is contained in:
committed by
Space Team
parent
780fe4848f
commit
233469d249
+2
-1
@@ -131,6 +131,8 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
|
|||||||
args.reportPerf = true
|
args.reportPerf = true
|
||||||
args.jvmTarget = JVM_TARGET
|
args.jvmTarget = JVM_TARGET
|
||||||
args.allowKotlinPackage = true
|
args.allowKotlinPackage = true
|
||||||
|
args.jdkHome = moduleData.jdkHome?.absolutePath
|
||||||
|
args.renderInternalDiagnosticNames = true
|
||||||
configureArgsUsingBuildFile(args, moduleData, tmp)
|
configureArgsUsingBuildFile(args, moduleData, tmp)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +155,6 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
|
|||||||
val modulesFile = tmp.toFile().resolve("modules.xml")
|
val modulesFile = tmp.toFile().resolve("modules.xml")
|
||||||
modulesFile.writeText(builder.asText().toString())
|
modulesFile.writeText(builder.asText().toString())
|
||||||
args.buildFile = modulesFile.absolutePath
|
args.buildFile = modulesFile.absolutePath
|
||||||
args.jdkHome = moduleData.jdkHome?.absolutePath
|
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData)
|
abstract fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData)
|
||||||
|
|||||||
+1
-1
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
|
|||||||
class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
||||||
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
|
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
|
||||||
args.useK2 = false
|
args.useK2 = false
|
||||||
|
args.useIR = true
|
||||||
args.jvmDefault = "compatibility"
|
args.jvmDefault = "compatibility"
|
||||||
args.apiVersion = API_VERSION
|
args.apiVersion = API_VERSION
|
||||||
args.optIn = arrayOf(
|
args.optIn = arrayOf(
|
||||||
@@ -19,7 +20,6 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
|||||||
"org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
|
"org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
|
||||||
)
|
)
|
||||||
args.multiPlatform = true
|
args.multiPlatform = true
|
||||||
args.renderInternalDiagnosticNames = true
|
|
||||||
args.noStdlib = true
|
args.noStdlib = true
|
||||||
args.noReflect = true
|
args.noReflect = true
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -28,7 +28,6 @@ class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
|||||||
"kotlin.io.path.ExperimentalPathApi",
|
"kotlin.io.path.ExperimentalPathApi",
|
||||||
"org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
|
"org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
|
||||||
)
|
)
|
||||||
args.renderInternalDiagnosticNames = true
|
|
||||||
args.noStdlib = true
|
args.noStdlib = true
|
||||||
args.noReflect = true
|
args.noReflect = true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user