Remove tests on jvm-abi-gen with old JVM backend

#KT-48532 Fixed
This commit is contained in:
Alexander Udalov
2022-09-05 21:18:39 +02:00
parent da86e536ad
commit 97f63d539c
31 changed files with 35 additions and 408 deletions
@@ -151,26 +151,14 @@ fun main(args: Array<String>) {
testGroup("plugins/jvm-abi-gen/test", "plugins/jvm-abi-gen/testData") { testGroup("plugins/jvm-abi-gen/test", "plugins/jvm-abi-gen/testData") {
testClass<AbstractCompareJvmAbiTest> { testClass<AbstractCompareJvmAbiTest> {
model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM)
}
testClass<AbstractJvmAbiContentTest> {
model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM)
}
testClass<AbstractCompileAgainstJvmAbiTest> {
model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM)
}
testClass<AbstractIrCompareJvmAbiTest> {
model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
testClass<AbstractIrJvmAbiContentTest> { testClass<AbstractJvmAbiContentTest> {
model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
testClass<AbstractIrCompileAgainstJvmAbiTest> { testClass<AbstractCompileAgainstJvmAbiTest> {
model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
} }
@@ -181,15 +169,15 @@ fun main(args: Array<String>) {
additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_LEGACY: \"") additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_LEGACY: \"")
) { ) {
testClass<AbstractLegacyCompareJvmAbiTest> { testClass<AbstractLegacyCompareJvmAbiTest> {
model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM) model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
testClass<AbstractLegacyJvmAbiContentTest> { testClass<AbstractLegacyJvmAbiContentTest> {
model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM) model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
testClass<AbstractLegacyCompileAgainstJvmAbiTest> { testClass<AbstractLegacyCompileAgainstJvmAbiTest> {
model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM) model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR)
} }
} }
@@ -1,14 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jvm.abi
import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
import java.io.File
import kotlin.test.assertFails
abstract class AbstractIrCompareJvmAbiTest : AbstractCompareJvmAbiTest() {
override val useIrBackend = true
}
@@ -1,8 +0,0 @@
package org.jetbrains.kotlin.jvm.abi
import java.io.File
import java.net.URLClassLoader
abstract class AbstractIrCompileAgainstJvmAbiTest : AbstractCompileAgainstJvmAbiTest() {
override val useIrBackend = true
}
@@ -1,5 +0,0 @@
package org.jetbrains.kotlin.jvm.abi
abstract class AbstractIrJvmAbiContentTest : AbstractJvmAbiContentTest() {
override val useIrBackend = true
}
@@ -15,13 +15,11 @@ import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
import kotlin.io.path.ExperimentalPathApi
import kotlin.io.path.createTempDirectory import kotlin.io.path.createTempDirectory
abstract class BaseJvmAbiTest : TestCase() { abstract class BaseJvmAbiTest : TestCase() {
private lateinit var workingDir: File private lateinit var workingDir: File
@OptIn(ExperimentalPathApi::class)
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
workingDir = createTempDirectory(javaClass.simpleName).toFile().apply { deleteOnExit() } workingDir = createTempDirectory(javaClass.simpleName).toFile().apply { deleteOnExit() }
@@ -82,7 +80,6 @@ abstract class BaseJvmAbiTest : TestCase() {
if (useLegacyAbiGen) abiOption("useLegacyAbiGen", "true") else null if (useLegacyAbiGen) abiOption("useLegacyAbiGen", "true") else null
).toTypedArray() ).toTypedArray()
destination = compilation.destinationDir.canonicalPath destination = compilation.destinationDir.canonicalPath
useOldBackend = !useIrBackend
noSourceDebugExtension = noSourceDebugExtension =
directives != null && InTextDirectivesUtils.findStringWithPrefixes(directives, "// NO_SOURCE_DEBUG_EXTENSION") != null directives != null && InTextDirectivesUtils.findStringWithPrefixes(directives, "// NO_SOURCE_DEBUG_EXTENSION") != null
} }
@@ -110,9 +107,6 @@ abstract class BaseJvmAbiTest : TestCase() {
} }
} }
protected open val useIrBackend: Boolean
get() = false
protected open val useLegacyAbiGen: Boolean protected open val useLegacyAbiGen: Boolean
get() = false get() = false
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class CompareJvmAbiTestGenerated extends AbstractCompareJvmAbiTest { public class CompareJvmAbiTestGenerated extends AbstractCompareJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
} }
public void testAllFilesPresentInCompare() throws Exception { public void testAllFilesPresentInCompare() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("anonymousObjects") @TestMetadata("anonymousObjects")
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class CompileAgainstJvmAbiTestGenerated extends AbstractCompileAgainstJvmAbiTest { public class CompileAgainstJvmAbiTestGenerated extends AbstractCompileAgainstJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
} }
public void testAllFilesPresentInCompile() throws Exception { public void testAllFilesPresentInCompile() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("anonymousObject") @TestMetadata("anonymousObject")
@@ -1,127 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jvm.abi;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/jvm-abi-gen/testData/compare")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IrCompareJvmAbiTestGenerated extends AbstractIrCompareJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInCompare() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
}
@TestMetadata("anonymousObjects")
public void testAnonymousObjects() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/anonymousObjects/");
}
@TestMetadata("classFlags")
public void testClassFlags() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/classFlags/");
}
@TestMetadata("classPrivateMemebers")
public void testClassPrivateMemebers() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/classPrivateMemebers/");
}
@TestMetadata("clinit")
public void testClinit() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/clinit/");
}
@TestMetadata("constant")
public void testConstant() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/constant/");
}
@TestMetadata("declarationOrderInline")
public void testDeclarationOrderInline() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderInline/");
}
@TestMetadata("declarationOrderInlineCall")
public void testDeclarationOrderInlineCall() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/");
}
@TestMetadata("declarationOrderPrivateInline")
public void testDeclarationOrderPrivateInline() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/");
}
@TestMetadata("functionBody")
public void testFunctionBody() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/functionBody/");
}
@TestMetadata("inlineFunInPrivateClass")
public void testInlineFunInPrivateClass() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/");
}
@TestMetadata("inlineFunInPrivateNestedClass")
public void testInlineFunInPrivateNestedClass() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/");
}
@TestMetadata("inlineFunctionBody")
public void testInlineFunctionBody() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/inlineFunctionBody/");
}
@TestMetadata("lambdas")
public void testLambdas() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/lambdas/");
}
@TestMetadata("parameterName")
public void testParameterName() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/parameterName/");
}
@TestMetadata("privateTypealias")
public void testPrivateTypealias() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/privateTypealias/");
}
@TestMetadata("returnType")
public void testReturnType() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/returnType/");
}
@TestMetadata("superClass")
public void testSuperClass() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/superClass/");
}
@TestMetadata("syntheticAccessors")
public void testSyntheticAccessors() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/syntheticAccessors/");
}
@TestMetadata("topLevelPrivateMembers")
public void testTopLevelPrivateMembers() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compare/topLevelPrivateMembers/");
}
}
@@ -1,127 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jvm.abi;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/jvm-abi-gen/testData/compile")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IrCompileAgainstJvmAbiTestGenerated extends AbstractIrCompileAgainstJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInCompile() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
}
@TestMetadata("anonymousObject")
public void testAnonymousObject() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/anonymousObject/");
}
@TestMetadata("classes")
public void testClasses() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/classes/");
}
@TestMetadata("clinit")
public void testClinit() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/clinit/");
}
@TestMetadata("inlineAnnotationInstantiation")
public void testInlineAnnotationInstantiation() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/");
}
@TestMetadata("inlineAnonymousObject")
public void testInlineAnonymousObject() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineAnonymousObject/");
}
@TestMetadata("inlineCapture")
public void testInlineCapture() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineCapture/");
}
@TestMetadata("inlineNoRegeneration")
public void testInlineNoRegeneration() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineNoRegeneration/");
}
@TestMetadata("inlineReifiedFunction")
public void testInlineReifiedFunction() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineReifiedFunction/");
}
@TestMetadata("inlineWhenMappings")
public void testInlineWhenMappings() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/");
}
@TestMetadata("innerObjectRegeneration")
public void testInnerObjectRegeneration() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/");
}
@TestMetadata("kt-40133")
public void testKt_40133() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/kt-40133/");
}
@TestMetadata("kt-40340")
public void testKt_40340() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/kt-40340/");
}
@TestMetadata("privateAnnotationsFromJavaApp")
public void testPrivateAnnotationsFromJavaApp() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateAnnotationsFromJavaApp/");
}
@TestMetadata("privateAnnotationsFromJavaLib")
public void testPrivateAnnotationsFromJavaLib() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateAnnotationsFromJavaLib/");
}
@TestMetadata("privateClassesFromJavaApp")
public void testPrivateClassesFromJavaApp() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateClassesFromJavaApp/");
}
@TestMetadata("privateClassesFromJavaLib")
public void testPrivateClassesFromJavaLib() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateClassesFromJavaLib/");
}
@TestMetadata("privateOnlyConstructors")
public void testPrivateOnlyConstructors() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateOnlyConstructors/");
}
@TestMetadata("privateValueClassConstructor")
public void testPrivateValueClassConstructor() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/privateValueClassConstructor/");
}
@TestMetadata("topLevel")
public void testTopLevel() throws Exception {
runTest("plugins/jvm-abi-gen/testData/compile/topLevel/");
}
}
@@ -1,67 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jvm.abi;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/jvm-abi-gen/testData/content")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IrJvmAbiContentTestGenerated extends AbstractIrJvmAbiContentTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInContent() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
}
@TestMetadata("annotation")
public void testAnnotation() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/annotation/");
}
@TestMetadata("annotationInstantiation")
public void testAnnotationInstantiation() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/annotationInstantiation/");
}
@TestMetadata("anonymousAnnotationInstantiation")
public void testAnonymousAnnotationInstantiation() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/");
}
@TestMetadata("anonymousWhenMapping")
public void testAnonymousWhenMapping() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/");
}
@TestMetadata("class")
public void testClass() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/class/");
}
@TestMetadata("kt50005")
public void testKt50005() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/kt50005/");
}
@TestMetadata("whenMapping")
public void testWhenMapping() throws Exception {
runTest("plugins/jvm-abi-gen/testData/content/whenMapping/");
}
}
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class JvmAbiContentTestGenerated extends AbstractJvmAbiContentTest { public class JvmAbiContentTestGenerated extends AbstractJvmAbiContentTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
} }
public void testAllFilesPresentInContent() throws Exception { public void testAllFilesPresentInContent() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotation") @TestMetadata("annotation")
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class LegacyCompareJvmAbiTestGenerated extends AbstractLegacyCompareJvmAbiTest { public class LegacyCompareJvmAbiTestGenerated extends AbstractLegacyCompareJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: ");
} }
public void testAllFilesPresentInCompare() throws Exception { public void testAllFilesPresentInCompare() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("anonymousObjects") @TestMetadata("anonymousObjects")
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class LegacyCompileAgainstJvmAbiTestGenerated extends AbstractLegacyCompileAgainstJvmAbiTest { public class LegacyCompileAgainstJvmAbiTestGenerated extends AbstractLegacyCompileAgainstJvmAbiTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: ");
} }
public void testAllFilesPresentInCompile() throws Exception { public void testAllFilesPresentInCompile() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("anonymousObject") @TestMetadata("anonymousObject")
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class LegacyJvmAbiContentTestGenerated extends AbstractLegacyJvmAbiContentTest { public class LegacyJvmAbiContentTestGenerated extends AbstractLegacyJvmAbiContentTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: ");
} }
public void testAllFilesPresentInContent() throws Exception { public void testAllFilesPresentInContent() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotation") @TestMetadata("annotation")
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1,2 +1,2 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM, JVM_IR // IGNORE_BACKEND: JVM_IR
@@ -1,2 +1,2 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// NO_SOURCE_DEBUG_EXTENSION // NO_SOURCE_DEBUG_EXTENSION
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1,2 +1,2 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// NO_SOURCE_DEBUG_EXTENSION // NO_SOURCE_DEBUG_EXTENSION
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
+1 -2
View File
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM
@@ -1,2 +1 @@
// IGNORE_BACKEND_LEGACY: JVM // IGNORE_BACKEND_LEGACY: JVM_IR
// IGNORE_BACKEND: JVM