Tests: remove TargetBackend.JVM_OLD
TargetBackend.JVM is equivalent to it at this point.
This commit is contained in:
committed by
Space Team
parent
dd3bebb690
commit
eeef70b2c8
@@ -11,7 +11,6 @@ enum class TargetBackend(
|
|||||||
) {
|
) {
|
||||||
ANY(false),
|
ANY(false),
|
||||||
JVM(false),
|
JVM(false),
|
||||||
JVM_OLD(false, JVM),
|
|
||||||
JVM_IR(true, JVM),
|
JVM_IR(true, JVM),
|
||||||
JVM_MULTI_MODULE_IR_AGAINST_OLD(true, JVM_IR),
|
JVM_MULTI_MODULE_IR_AGAINST_OLD(true, JVM_IR),
|
||||||
JVM_MULTI_MODULE_OLD_AGAINST_IR(false, JVM),
|
JVM_MULTI_MODULE_OLD_AGAINST_IR(false, JVM),
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
// LANGUAGE: +BreakContinueInInlineLambdas
|
// LANGUAGE: +BreakContinueInInlineLambdas
|
||||||
// IGNORE_BACKEND: JVM, JVM_OLD
|
// IGNORE_BACKEND: JVM
|
||||||
// WITH_STDLIB
|
// WITH_STDLIB
|
||||||
|
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
// IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6, NATIVE, WASM, JVM_OLD
|
// TARGET_BACKEND: JVM_IR
|
||||||
// KOTLIN_SCRIPT_DEFINITION: org.jetbrains.kotlin.codegen.TestScriptWithReceivers
|
// KOTLIN_SCRIPT_DEFINITION: org.jetbrains.kotlin.codegen.TestScriptWithReceivers
|
||||||
|
|
||||||
// receiver: abracadabra
|
// receiver: abracadabra
|
||||||
|
|||||||
+1
-1
@@ -45,5 +45,5 @@ open class AbstractJvmIrAgainstOldBoxInlineTest : AbstractBoxInlineWithDifferent
|
|||||||
open class AbstractJvmOldAgainstIrBoxInlineTest : AbstractBoxInlineWithDifferentBackendsTest(
|
open class AbstractJvmOldAgainstIrBoxInlineTest : AbstractBoxInlineWithDifferentBackendsTest(
|
||||||
targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR,
|
targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR,
|
||||||
backendForLib = TargetBackend.JVM_IR,
|
backendForLib = TargetBackend.JVM_IR,
|
||||||
backendForMain = TargetBackend.JVM_OLD
|
backendForMain = TargetBackend.JVM
|
||||||
)
|
)
|
||||||
|
|||||||
+2
-2
@@ -110,11 +110,11 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
testClass<AbstractCustomScriptCodegenTest> {
|
testClass<AbstractCustomScriptCodegenTest> {
|
||||||
model("codegen/customScript", pattern = "^(.*)$")
|
model("codegen/customScript", pattern = "^(.*)$", targetBackend = TargetBackend.JVM)
|
||||||
}
|
}
|
||||||
|
|
||||||
testClass<AbstractIrCustomScriptCodegenTest> {
|
testClass<AbstractIrCustomScriptCodegenTest> {
|
||||||
model("codegen/customScript", pattern = "^(.*)$")
|
model("codegen/customScript", pattern = "^(.*)$", targetBackend = TargetBackend.JVM_IR)
|
||||||
}
|
}
|
||||||
|
|
||||||
testClass<AbstractIrCfgTestCase> {
|
testClass<AbstractIrCfgTestCase> {
|
||||||
|
|||||||
+3
-7
@@ -9,6 +9,7 @@ import com.intellij.testFramework.TestDataPath;
|
|||||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||||
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
||||||
|
import org.jetbrains.kotlin.test.TargetBackend;
|
||||||
import org.jetbrains.kotlin.test.TestMetadata;
|
import org.jetbrains.kotlin.test.TestMetadata;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
@@ -22,16 +23,11 @@ import java.util.regex.Pattern;
|
|||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
public class CustomScriptCodegenTestGenerated extends AbstractCustomScriptCodegenTest {
|
public class CustomScriptCodegenTestGenerated extends AbstractCustomScriptCodegenTest {
|
||||||
private void runTest(String testDataFilePath) throws Exception {
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testAllFilesPresentInCustomScript() throws Exception {
|
public void testAllFilesPresentInCustomScript() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/customScript"), Pattern.compile("^(.*)$"), null, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/customScript"), Pattern.compile("^(.*)$"), null, TargetBackend.JVM, true);
|
||||||
}
|
|
||||||
|
|
||||||
@TestMetadata("captureImplicitReceiverInDefaultValue.kts")
|
|
||||||
public void testCaptureImplicitReceiverInDefaultValue_kts() throws Exception {
|
|
||||||
runTest("compiler/testData/codegen/customScript/captureImplicitReceiverInDefaultValue.kts");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("pathPattern5.kts")
|
@TestMetadata("pathPattern5.kts")
|
||||||
|
|||||||
+3
-2
@@ -9,6 +9,7 @@ import com.intellij.testFramework.TestDataPath;
|
|||||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||||
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
||||||
|
import org.jetbrains.kotlin.test.TargetBackend;
|
||||||
import org.jetbrains.kotlin.test.TestMetadata;
|
import org.jetbrains.kotlin.test.TestMetadata;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
@@ -22,11 +23,11 @@ import java.util.regex.Pattern;
|
|||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
public class IrCustomScriptCodegenTestGenerated extends AbstractIrCustomScriptCodegenTest {
|
public class IrCustomScriptCodegenTestGenerated extends AbstractIrCustomScriptCodegenTest {
|
||||||
private void runTest(String testDataFilePath) throws Exception {
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testAllFilesPresentInCustomScript() throws Exception {
|
public void testAllFilesPresentInCustomScript() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/customScript"), Pattern.compile("^(.*)$"), null, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/customScript"), Pattern.compile("^(.*)$"), null, TargetBackend.JVM_IR, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("captureImplicitReceiverInDefaultValue.kts")
|
@TestMetadata("captureImplicitReceiverInDefaultValue.kts")
|
||||||
|
|||||||
@@ -31,8 +31,6 @@ import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContext
|
|||||||
abstract class AbstractCustomScriptCodegenTest : CodegenTestCase() {
|
abstract class AbstractCustomScriptCodegenTest : CodegenTestCase() {
|
||||||
private lateinit var scriptDefinitions: List<String>
|
private lateinit var scriptDefinitions: List<String>
|
||||||
|
|
||||||
override val backend = TargetBackend.JVM_OLD
|
|
||||||
|
|
||||||
override fun setUp() {
|
override fun setUp() {
|
||||||
super.setUp()
|
super.setUp()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user