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

[Test] Mark BB tests on modern jdks with tag and ignore them in different-jdk tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-07-14 16:33:14 +03:00
committed by teamcityserver
parent c2e2068682
commit de73622af9
27 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+3
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Tag;
import java.io.File;
import java.util.regex.Pattern;
@@ -41680,6 +41681,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava15")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava15 {
@@ -41760,6 +41762,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava9")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava9 {
compiler/testData/codegen/box/testsWithJava15/_tags.txt
Vendored
+1
View File
@@ -0,0 +1 @@
<modernJava>
compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// FILE: JavaClass.java
public class JavaClass {
compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
@JvmRecord
compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
@JvmRecord
compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// MODULE: lib
compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// FILE: JavaClass.java
compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// !JVM_DEFAULT_MODE: all-compatibility
compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// !JVM_DEFAULT_MODE: enable
compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// FILE: MyRec.java
public record MyRec(String name) implements KI {
compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// FILE: MyRec.java
public record MyRec(String name) {
compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +JvmRecordSupport
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
// FILE: MyRec.java
public record MyRec(String name) {}
compiler/testData/codegen/box/testsWithJava9/_tags.txt
Vendored
+1
View File
@@ -0,0 +1 @@
<modernJava>
compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
fun box(): String {
val p = 3147483648u
val a = "_"
compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
fun box(): String {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
fun test(z: Long): String {
val result = "" + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
fun box(): String {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy
// JVM_TARGET: 9
fun box(): String {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy
// JVM_TARGET: 9
fun test(z: Long): String {
val result = "" + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy
// JVM_TARGET: 9
fun box(): String {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
inline class Str(val s: String)
inline class NStr(val s: String?)
compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// JVM_TARGET: 9
fun test(a: String, b: String?): String {
return a + "\u0001" + 2.toChar() + 3.toChar() + 4L + b + 5.0 + 6F + '7' + b + "\u0002" + 1.toChar()
compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// STRING_CONCAT: indy-with-constants
// JVM_TARGET: 9
inline fun test(crossinline s: (String) -> String): String {
var result = "1" + s("2") + "3" + 4 + {
"5" + s("6") + "7"
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+3
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Tag;
import java.io.File;
import java.util.regex.Pattern;
@@ -41524,6 +41525,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava15")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava15 {
@@ -41604,6 +41606,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava9")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava9 {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+3
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Tag;
import java.io.File;
import java.util.regex.Pattern;
@@ -41680,6 +41681,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava15")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava15 {
@@ -41760,6 +41762,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
@Nested
@Tag("<modernJava>")
@TestMetadata("compiler/testData/codegen/box/testsWithJava9")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava9 {
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt
+6 -4
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.test.runners.codegen
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.test.Constructor
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.TestJdkKind
@@ -13,12 +14,12 @@ import org.jetbrains.kotlin.test.backend.handlers.BytecodeListingHandler
import org.jetbrains.kotlin.test.backend.handlers.BytecodeTextHandler
import org.jetbrains.kotlin.test.bind
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_DEXING
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.USE_JAVAC_BASED_ON_JVM_TARGET
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JDK_KIND
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JVM_TARGET
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler
@@ -56,19 +57,20 @@ abstract class AbstractJvmBlackBoxCodegenTestBase<R : ResultingArtifact.Frontend
}
forTestsMatching("compiler/testData/codegen/box/testsWithJava9/*") {
configureModernJavaTest(TestJdkKind.FULL_JDK_9)
configureModernJavaTest(TestJdkKind.FULL_JDK_9, JvmTarget.JVM_9)
}
forTestsMatching("compiler/testData/codegen/box/testsWithJava15/*") {
configureModernJavaTest(TestJdkKind.FULL_JDK_15)
configureModernJavaTest(TestJdkKind.FULL_JDK_15, JvmTarget.JVM_15)
}
enableMetaInfoHandler()
}
private fun TestConfigurationBuilder.configureModernJavaTest(jdkKind: TestJdkKind) {
private fun TestConfigurationBuilder.configureModernJavaTest(jdkKind: TestJdkKind, jvmTarget: JvmTarget) {
defaultDirectives {
JDK_KIND with jdkKind
JVM_TARGET with jvmTarget
+WITH_STDLIB
+USE_JAVAC_BASED_ON_JVM_TARGET
+IGNORE_DEXING
compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
+2
View File
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.test.runners.codegen.*
import org.junit.jupiter.api.parallel.Execution
import org.junit.jupiter.api.parallel.ExecutionMode
import org.junit.platform.runner.JUnitPlatform
import org.junit.platform.suite.api.ExcludeTags
import org.junit.platform.suite.api.IncludeClassNamePatterns
import org.junit.platform.suite.api.SelectClasses
import org.junit.platform.suite.api.UseTechnicalNames
@@ -28,6 +29,7 @@ import org.junit.runner.RunWith
IrCompileKotlinAgainstInlineKotlinTestGenerated::class
)
@IncludeClassNamePatterns(".*Test.*Generated")
@ExcludeTags("<modernJava>")
@UseTechnicalNames
abstract class CustomJvmTargetOnJvmBaseTest