Add explicit WITH_RUNTIME to boxAgainstJava tests which need stdlib

2026-05-09 00:21:47 +00:00 · 2019-03-27 15:09:30 +01:00
parent 15928c5b46
commit cb7727d51a
23 changed files with 21 additions and 9 deletions
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java

 class Foo {
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java

 class Foo {
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java

 class Foo {
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java

 import java.lang.annotation.Retention;
--- a/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
+++ b/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
@@ -28,7 +28,6 @@ fun box(): String {
        return "Fail: should have been an exception"
    }
    catch(e: IllegalStateException) {
-        println(e.message)
        return "OK"
    }
 }
--- a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
@@ -1,10 +1,10 @@
+// WITH_RUNTIME
 // FILE: J.java

 public class J {}

 // FILE: 1.kt

-import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals

 fun box(): String {
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaInterface.java

 interface JavaInterface {
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Super.java

 class Super {
--- a/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Custom.java

 class Custom {
--- a/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Promise.java
 import org.jetbrains.annotations.NotNull;

--- a/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
@@ -1,5 +1,6 @@
 // SKIP_JDK6
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaClass.java

 class JavaClass {
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
@@ -17,7 +17,7 @@ class JavaClass {

 fun box(): String {
    val javaClass = JavaClass()
-    if (javaClass.x.isEmpty()) {
+    if (javaClass.x == "") {
        javaClass.x = "OK"
    }
    return javaClass.x
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
@@ -17,7 +17,7 @@ class JavaClass {

 fun box(): String {
    val javaClass = JavaClass()
-    if (javaClass.x.isEmpty()) {
+    if (javaClass.x == "") {
        javaClass.x = "OK"
    }
    return javaClass.x