Remove :compiler:tests-common-jvm6 project and JvmTarget6OnBaseJvm tests

This commit is contained in:
Abduqodiri Qurbonzoda
2022-07-12 11:49:28 +03:00
parent de775ad728
commit cf44753aed
17 changed files with 61 additions and 432 deletions
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
val testJvm6ServerRuntime by configurations.creating
dependencies {
testApi(projectTests(":compiler"))
testApi(projectTests(":compiler:test-infrastructure"))
@@ -16,7 +14,6 @@ dependencies {
testImplementation(intellijCore())
testRuntimeOnly(project(":kotlin-reflect"))
testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
}
sourceSets {
@@ -50,44 +47,16 @@ fun Project.codegenTest(
group = "verification"
}
// Should the tests with target = 6 be removed ?
codegenTest(
target = 6,
jdk = JdkMajorVersion.JDK_1_8,
jvm = JdkMajorVersion.JDK_1_6.majorVersion.toString()
) {
dependsOn(testJvm6ServerRuntime)
doFirst {
systemProperty("kotlin.test.default.jvm.target", "1.6")
systemProperty("kotlin.test.java.compilation.target", "1.6")
systemProperty(
"JDK_16",
project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_6).get().metadata.installationPath.asFile.absolutePath
)
val port = project.findProperty("kotlin.compiler.codegen.tests.port") ?: "5100"
systemProperty("kotlin.test.box.in.separate.process.port", port)
systemProperty("kotlin.test.box.in.separate.process.server.classpath", testJvm6ServerRuntime.asPath)
}
}
//JDK 8
codegenTest(target = 6, jdk = JdkMajorVersion.JDK_1_8)
// This is default one and is executed in default build configuration
codegenTest(target = 8, jdk = JdkMajorVersion.JDK_1_8)
//JDK 11
codegenTest(target = 6, jdk = JdkMajorVersion.JDK_11)
codegenTest(target = 8, jdk = JdkMajorVersion.JDK_11)
codegenTest(target = 11, jdk = JdkMajorVersion.JDK_11)
//JDK 17
codegenTest(target = 6, jdk = JdkMajorVersion.JDK_17)
codegenTest(target = 8, jdk = JdkMajorVersion.JDK_17)
codegenTest(target = 17, jdk = JdkMajorVersion.JDK_17) {
@@ -98,7 +67,6 @@ codegenTest(target = 17, jdk = JdkMajorVersion.JDK_17) {
val mostRecentJdk = JdkMajorVersion.values().last()
//LAST JDK from JdkMajorVersion available on machine
codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk)
codegenTest(target = 8, jvm = "Last", jdk = mostRecentJdk)
codegenTest(