Add explicit WITH_RUNTIME to boxAgainstJava tests which need stdlib

This commit is contained in:
Alexander Udalov
2019-03-27 15:09:30 +01:00
parent 15928c5b46
commit cb7727d51a
23 changed files with 21 additions and 9 deletions
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java // FILE: Foo.java
class Foo { class Foo {
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java // FILE: Foo.java
class Foo { class Foo {
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java // FILE: Foo.java
class Foo { class Foo {
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java // FILE: JavaAnn.java
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -28,7 +28,6 @@ fun box(): String {
return "Fail: should have been an exception" return "Fail: should have been an exception"
} }
catch(e: IllegalStateException) { catch(e: IllegalStateException) {
println(e.message)
return "OK" return "OK"
} }
} }
@@ -1,10 +1,10 @@
// WITH_RUNTIME
// FILE: J.java // FILE: J.java
public class J {} public class J {}
// FILE: 1.kt // FILE: 1.kt
import kotlin.reflect.jvm.*
import kotlin.test.assertEquals import kotlin.test.assertEquals
fun box(): String { fun box(): String {
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaInterface.java // FILE: JavaInterface.java
interface JavaInterface { interface JavaInterface {
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Super.java // FILE: Super.java
class Super { class Super {
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Custom.java // FILE: Custom.java
class Custom { class Custom {
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Promise.java // FILE: Promise.java
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -1,5 +1,6 @@
// SKIP_JDK6 // SKIP_JDK6
// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaClass.java // FILE: JavaClass.java
class JavaClass { class JavaClass {
@@ -17,7 +17,7 @@ class JavaClass {
fun box(): String { fun box(): String {
val javaClass = JavaClass() val javaClass = JavaClass()
if (javaClass.x.isEmpty()) { if (javaClass.x == "") {
javaClass.x = "OK" javaClass.x = "OK"
} }
return javaClass.x return javaClass.x
@@ -17,7 +17,7 @@ class JavaClass {
fun box(): String { fun box(): String {
val javaClass = JavaClass() val javaClass = JavaClass()
if (javaClass.x.isEmpty()) { if (javaClass.x == "") {
javaClass.x = "OK" javaClass.x = "OK"
} }
return javaClass.x return javaClass.x
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.test.ConfigurationKind
import java.io.File import java.io.File
abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() { abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() {
@@ -39,8 +38,4 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT
configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
} }
} }
override fun extractConfigurationKind(files: MutableList<TestFile>): ConfigurationKind {
return ConfigurationKind.ALL
}
} }