Use 'JVM_TARGET: 1.8' directive in codegen tests on 1.8 target

compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt

@@ -1,4 +1,5 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
+
 interface Test<T> {
     fun test(p: T): T {
         return p
@@ -18,4 +19,3 @@ fun <T> execute(t: Test<T>, p: T): T {
 fun box(): String {
     return execute(TestClass(), "O")
 }
-

compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt

@@ -1,4 +1,5 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
+
 interface Test<T> {
     fun test(p: T): T {
         return p
@@ -21,4 +22,3 @@ fun <T> execute(t: Test<T>, p: T): T {
 fun box(): String {
     return execute(TestClass(), "O")
 }
-

compiler/testData/codegen/java8/box/jvm8/diamond.kt

@@ -1,6 +1,7 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 // WITH_REFLECT
 // FULL_JDK
+
 interface Test {
     fun test(): String {
         return "Test"
@@ -30,6 +31,7 @@ class TestClass2 : TestClass(), Test3 {
 fun box(): String {
     val test = TestClass2().test()
     if (test != "Test2") return "fail 1: $test"
+    // TODO: enable this test once the required behavior is specified
 //    checkNoMethod(TestClass::class.java, "test")
 //    checkNoMethod(Test3::class.java, "test")
 //    checkNoMethod(TestClass2::class.java, "test")
@@ -44,5 +46,5 @@ fun checkNoMethod(clazz: Class<*>, name: String) {
     catch (e: NoSuchMethodException) {
         return
     }
-    throw java.lang.AssertionError("fail " + clazz)
+    throw AssertionError("fail " + clazz)
 }

compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInClass.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
 interface Test {
@@ -11,6 +11,7 @@ class TestClass : Test {
 }
 
 fun box(): String {
+    // TODO: enable this test once the required behavior is specified
 //    try {
 //        TestClass::class.java.getDeclaredMethod("test")
 //    }

compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
 interface Test {
@@ -11,6 +11,7 @@ interface Test2 : Test {
 }
 
 fun box(): String {
+    // TODO: enable this test once the required behavior is specified
 //    try {
 //        Test2::class.java.getDeclaredMethod("test")
 //    }

compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface2.kt

@@ -1,6 +1,7 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
+
 interface Test {
     fun test() {
     }
@@ -15,6 +16,7 @@ interface Test3 : Test2 {
 }
 
 fun box(): String {
+    // TODO: enable this test once the required behavior is specified
 //    try {
 //        Test3::class.java.getDeclaredMethod("test")
 //    }

compiler/testData/codegen/java8/box/jvm8/simpleCall.kt

@@ -1,4 +1,5 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
+
 interface Test {
     fun test(): String {
         return "OK"

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInClass.kt

@@ -8,7 +8,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 class TestClass : Test {
 
 }

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface.kt

@@ -8,7 +8,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 interface Test2 : Test {
 
 }

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface2.kt

@@ -9,7 +9,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 interface Test2 : Test {
 
 }
@@ -21,6 +21,7 @@ class TestClass : Test3
 
 fun box(): String {
     checkPresent(Test2::class.java, "test")
+    // TODO: enable this test once the required behavior is specified
 //    checkNoMethod(Test3::class.java, "test")
 
     return TestClass().test()

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt

@@ -9,7 +9,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 interface Test2 : Test {
 
 }
@@ -31,6 +31,7 @@ class TestClass : Test4 {
 fun box(): String {
     checkPresent(Test2::class.java, "test")
     checkPresent(Test3::class.java, "test")
+    // TODO: enable this test once the required behavior is specified
     //checkNoMethod(Test4::class.java, "test")
 
     return TestClass().test()

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt

@@ -9,7 +9,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 open class TestClass : Test {
 
 }

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt

@@ -9,7 +9,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 open class TestClass : Test {
 
 }

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCall.kt

@@ -7,7 +7,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 class TestClass : Test {
 
 }

compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt

@@ -7,7 +7,7 @@ interface Test {
 }
 
 // FILE: 2.kt
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
 interface Test2 : Test {
 
 }

compiler/testData/codegen/java8/writeFlags/defaultMethod.kt

@@ -1,4 +1,5 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
+
 interface Test {
     fun test(): String {
         return "OK"

compiler/testData/codegen/java8/writeFlags/interfaceAndDefaultImpls.kt

@@ -1,4 +1,5 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+// JVM_TARGET: 1.8
+
 interface Test {
     fun a() {
 
@@ -9,7 +10,6 @@ interface Test {
 // TESTED_OBJECTS: Test$DefaultImpls
 // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_SUPER
 
-
 // TESTED_OBJECT_KIND: class
 // TESTED_OBJECTS: Test
 // FLAGS: ACC_PUBLIC, ACC_ABSTRACT, ACC_INTERFACE

compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java

@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.TestDataFile;
 import kotlin.collections.ArraysKt;
+import kotlin.collections.CollectionsKt;
 import kotlin.io.FilesKt;
 import kotlin.text.Charsets;
 import org.jetbrains.annotations.NotNull;
@@ -38,6 +39,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.config.CompilerConfigurationKey;
 import org.jetbrains.kotlin.config.JVMConfigurationKeys;
+import org.jetbrains.kotlin.config.JvmTarget;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtFile;
@@ -146,6 +148,14 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
         List<String> kotlinConfigurationFlags = new ArrayList<String>(0);
         for (TestFile testFile : testFilesWithConfigurationDirectives) {
             kotlinConfigurationFlags.addAll(InTextDirectivesUtils.findListWithPrefixes(testFile.content, "// KOTLIN_CONFIGURATION_FLAGS:"));
+
+            List<String> lines = InTextDirectivesUtils.findLinesWithPrefixesRemoved(testFile.content, "// JVM_TARGET:");
+            if (!lines.isEmpty()) {
+                String targetString = CollectionsKt.single(lines);
+                JvmTarget jvmTarget = JvmTarget.Companion.fromString(targetString);
+                assert jvmTarget != null : "Unknown target: " + targetString;
+                configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget);
+            }
         }
 
         updateConfigurationWithFlags(configuration, kotlinConfigurationFlags);