K2 Scripting: disable K2 lightTree-based script tests
they were enabled by mistake and do not work properly until LT parsing is implemented depends on #KT-60127
This commit is contained in:
committed by
Space Team
parent
a5c2eb66a2
commit
d6c9a492ad
+1
-53
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
|
||||
public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBoxCodegenBasedTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "cinterop");
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "cinterop", "script");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -51607,58 +51607,6 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/script")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Script {
|
||||
@Test
|
||||
public void testAllFilesPresentInScript() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/script"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classReference.kt")
|
||||
public void testClassReference() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/classReference.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTests.kt")
|
||||
public void testLocalCaptureTests() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTests.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTestsK2.kt")
|
||||
public void testLocalCaptureTestsK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTestsK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scripInstance.kt")
|
||||
public void testScripInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scripInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstance.kt")
|
||||
public void testScriptNestedClassInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstanceK2.kt")
|
||||
public void testScriptNestedClassInstanceK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstanceK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptPropFromAnotherModuleK2.kt")
|
||||
public void testScriptPropFromAnotherModuleK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptPropFromAnotherModuleK2.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/sealed")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+1
-53
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
|
||||
public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFirReversedBlackBoxCodegenBasedTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "cinterop");
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "cinterop", "script");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -51607,58 +51607,6 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/script")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Script {
|
||||
@Test
|
||||
public void testAllFilesPresentInScript() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/script"), Pattern.compile("^(.+)\\.kt$"), null, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classReference.kt")
|
||||
public void testClassReference() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/classReference.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTests.kt")
|
||||
public void testLocalCaptureTests() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTests.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTestsK2.kt")
|
||||
public void testLocalCaptureTestsK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTestsK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scripInstance.kt")
|
||||
public void testScripInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scripInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstance.kt")
|
||||
public void testScriptNestedClassInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstanceK2.kt")
|
||||
public void testScriptNestedClassInstanceK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstanceK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptPropFromAnotherModuleK2.kt")
|
||||
public void testScriptPropFromAnotherModuleK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptPropFromAnotherModuleK2.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/sealed")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+1
-53
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
|
||||
public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTreeBlackBoxCodegenTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "script");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -51112,58 +51112,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/script")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Script {
|
||||
@Test
|
||||
public void testAllFilesPresentInScript() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/script"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classReference.kt")
|
||||
public void testClassReference() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/classReference.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTests.kt")
|
||||
public void testLocalCaptureTests() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTests.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTestsK2.kt")
|
||||
public void testLocalCaptureTestsK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTestsK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scripInstance.kt")
|
||||
public void testScripInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scripInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstance.kt")
|
||||
public void testScriptNestedClassInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstanceK2.kt")
|
||||
public void testScriptNestedClassInstanceK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstanceK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptPropFromAnotherModuleK2.kt")
|
||||
public void testScriptPropFromAnotherModuleK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptPropFromAnotherModuleK2.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/sealed")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+1
-53
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
|
||||
public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated extends AbstractFirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "script");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -51112,58 +51112,6 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/script")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Script {
|
||||
@Test
|
||||
public void testAllFilesPresentInScript() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/script"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classReference.kt")
|
||||
public void testClassReference() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/classReference.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTests.kt")
|
||||
public void testLocalCaptureTests() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTests.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTestsK2.kt")
|
||||
public void testLocalCaptureTestsK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTestsK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scripInstance.kt")
|
||||
public void testScripInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scripInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstance.kt")
|
||||
public void testScriptNestedClassInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstanceK2.kt")
|
||||
public void testScriptNestedClassInstanceK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstanceK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptPropFromAnotherModuleK2.kt")
|
||||
public void testScriptPropFromAnotherModuleK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptPropFromAnotherModuleK2.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/sealed")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+1
-53
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
|
||||
public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistencyTest {
|
||||
@Test
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k2");
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k2", "script");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -50428,58 +50428,6 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/script")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Script {
|
||||
@Test
|
||||
public void testAllFilesPresentInScript() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/script"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("classReference.kt")
|
||||
public void testClassReference() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/classReference.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTests.kt")
|
||||
public void testLocalCaptureTests() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTests.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("localCaptureTestsK2.kt")
|
||||
public void testLocalCaptureTestsK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/localCaptureTestsK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scripInstance.kt")
|
||||
public void testScripInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scripInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstance.kt")
|
||||
public void testScriptNestedClassInstance() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstance.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptNestedClassInstanceK2.kt")
|
||||
public void testScriptNestedClassInstanceK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptNestedClassInstanceK2.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("scriptPropFromAnotherModuleK2.kt")
|
||||
public void testScriptPropFromAnotherModuleK2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/script/scriptPropFromAnotherModuleK2.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/codegen/box/sealed")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+4
-3
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN
|
||||
fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
|
||||
val excludedCustomTestdataPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN
|
||||
val k2BoxTestDir = listOf("multiplatform/k2")
|
||||
val excludedScriptDirs = listOf("script")
|
||||
|
||||
generateTestGroupSuiteWithJUnit5(args, mainClassName) {
|
||||
testGroup(testsRoot = "compiler/tests-common-new/tests-gen", testDataRoot = "compiler/testData") {
|
||||
@@ -79,7 +80,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
|
||||
|
||||
// We split JVM ABI tests into two parts, to avoid creation of a huge file, unable to analyze by IntelliJ with default settings
|
||||
testClass<AbstractJvmAbiConsistencyTest>("JvmAbiConsistencyTestBoxGenerated") {
|
||||
model("codegen/box", excludeDirs = k2BoxTestDir)
|
||||
model("codegen/box", excludeDirs = k2BoxTestDir + excludedScriptDirs)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmAbiConsistencyTest>("JvmAbiConsistencyTestRestGenerated") {
|
||||
@@ -276,7 +277,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
|
||||
|
||||
testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") {
|
||||
testClass<AbstractFirLightTreeBlackBoxCodegenTest> {
|
||||
model("codegen/box")
|
||||
model("codegen/box", excludeDirs = excludedScriptDirs)
|
||||
}
|
||||
|
||||
testClass<AbstractFirPsiBlackBoxCodegenTest> {
|
||||
@@ -284,7 +285,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
|
||||
}
|
||||
|
||||
testClass<AbstractFirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTest> {
|
||||
model("codegen/box")
|
||||
model("codegen/box", excludeDirs = excludedScriptDirs)
|
||||
}
|
||||
|
||||
testClass<AbstractFirLightTreeBlackBoxCodegenTest>("FirLightTreeBlackBoxModernJdkCodegenTestGenerated") {
|
||||
|
||||
+4
-2
@@ -332,14 +332,16 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() {
|
||||
testClass<AbstractLLFirBlackBoxCodegenBasedTest> {
|
||||
model(
|
||||
"codegen/box",
|
||||
excludeDirs = listOf("cinterop") // CInterop tests contain .DEF .H .CPP .M files, which are invalid for Compiler Core new test system
|
||||
excludeDirs = listOf("cinterop", "script") // CInterop tests contain .DEF .H .CPP .M files, which are invalid for Compiler Core new test system
|
||||
// script is excluded until KT-60127 is implemented
|
||||
)
|
||||
}
|
||||
|
||||
testClass<AbstractLLFirReversedBlackBoxCodegenBasedTest> {
|
||||
model(
|
||||
"codegen/box",
|
||||
excludeDirs = listOf("cinterop") // CInterop tests contain .DEF .H .CPP .M files, which are invalid for Compiler Core new test system
|
||||
excludeDirs = listOf("cinterop", "script") // CInterop tests contain .DEF .H .CPP .M files, which are invalid for Compiler Core new test system
|
||||
// script is excluded until KT-60127 is implemented
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user