From 20af98c776d4a2a5efb0798a0bb099716ba6dbe6 Mon Sep 17 00:00:00 2001 From: Evgenii Mazhukin Date: Mon, 6 Nov 2023 19:46:43 +0000 Subject: [PATCH] [Tests] Re-enable K1 IC tests for expect-actual ^KT-60831 fixed ^KT-60831 next step KT-63183 Merge-request: KT-MR-12855 Merged-by: Evgenii Mazhukin --- ...LegacyMultiplatformJsCompilerRunnerTest.kt | 2 +- ...entalMultiplatformJvmCompilerRunnerTest.kt | 6 ++- ...latformJvmCompilerRunnerTestGenerated.java | 20 ++++----- .../generators/model/SimpleTestClassModel.kt | 9 +++- .../kotlin/generators/tests/GenerateTests.kt | 41 ++++++++++++------- .../jps/build/dependeciestxt/PACKAGE.md | 4 +- .../mpp/allPlatforms/touchActual/args.txt | 2 + .../mpp/allPlatforms/touchActual/fail.txt | 0 .../mpp/allPlatforms/touchExpect/args.txt | 2 + .../mpp/allPlatforms/touchExpect/fail.txt | 0 .../mpp/jvmOnly/multifilePartChanged/fail.txt | 0 .../optionalExpectationWithActual/fail.txt | 0 .../multifilePartChanged/X.kt | 0 .../jvmOnlyK1/multifilePartChanged/args.txt | 1 + .../multifilePartChanged/build.log | 0 .../multifilePartChanged/commonX.kt | 0 .../multifilePartChanged/dummy.kt | 0 .../multifilePartChanged/utilsActual.kt | 0 .../multifilePartChanged/utilsActual.kt.new | 0 .../multifilePartChanged/utilsNoActual.kt | 0 .../optionalExpectationWithActual/actualA.kt | 0 .../optionalExpectationWithActual/args.txt | 3 ++ .../optionalExpectationWithActual/b.kt | 0 .../optionalExpectationWithActual/b.kt.new.1 | 0 .../optionalExpectationWithActual/b.kt.new.2 | 0 .../optionalExpectationWithActual/build.log | 0 .../optionalExpectationWithActual/expectA.kt | 0 27 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/args.txt delete mode 100644 jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/fail.txt create mode 100644 jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/args.txt delete mode 100644 jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/fail.txt delete mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/fail.txt delete mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/fail.txt rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/X.kt (100%) create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/args.txt rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/commonX.kt (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/dummy.kt (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/utilsActual.kt (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/utilsActual.kt.new (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/multifilePartChanged/utilsNoActual.kt (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/actualA.kt (100%) create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/args.txt rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/b.kt (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/b.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/b.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/build.log (100%) rename jps/jps-plugin/testData/incremental/mpp/{jvmOnly => jvmOnlyK1}/optionalExpectationWithActual/expectA.kt (100%) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt index 3850c32aeba..541d0065d6a 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt @@ -25,4 +25,4 @@ abstract class AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest : multiPlatform = true } } -} \ No newline at end of file +} diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJvmCompilerRunnerTest.kt index 0423ea7fad7..349e17d44d9 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJvmCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJvmCompilerRunnerTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. + * Copyright 2010-2023 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ abstract class AbstractIncrementalMultiplatformJvmCompilerRunnerTest : AbstractI override fun createCompilerArguments(destinationDir: File, testDir: File): K2JVMCompilerArguments { return super.createCompilerArguments(destinationDir, testDir).apply { multiPlatform = true + useK2 = false + languageVersion = "1.9" } } -} \ No newline at end of file +} diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java index f5b2e9e7697..c9ed2b24657 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java @@ -68,29 +68,29 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst } } - @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnly") + @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmOnly extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest { + public static class JvmOnlyK1 extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - public void testAllFilesPresentInJvmOnly() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true); + public void testAllFilesPresentInJvmOnlyK1() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("multifilePartChanged") public void testMultifilePartChanged() throws Exception { - runTest("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/"); + runTest("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/"); } @TestMetadata("optionalExpectationWithActual") public void testOptionalExpectationWithActual() throws Exception { - runTest("jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/"); + runTest("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/"); } - @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged") + @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class MultifilePartChanged extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest { @@ -99,11 +99,11 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst } public void testAllFilesPresentInMultifilePartChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } - @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual") + @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class OptionalExpectationWithActual extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest { @@ -112,7 +112,7 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst } public void testAllFilesPresentInOptionalExpectationWithActual() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt index b60f5ad84c7..29bb1c41048 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt @@ -109,8 +109,13 @@ class SimpleTestClassModel( val listFiles = rootFile.listFiles() if (listFiles != null && (deep == null || deep == 0)) { for (file in listFiles) { - val excluded = excludePattern != null && excludePattern.matcher(file.name).matches() - if (filenamePattern.matcher(file.name).matches() && !excluded) { + val excluded = let { + val name = file.name + val byPattern = excludePattern != null && excludePattern.matcher(name).matches() + val byDirectory = file.isDirectory && (name in excludeDirs || name in excludeDirsRecursively) + return@let byPattern || byDirectory + } + if (!excluded && filenamePattern.matcher(file.name).matches()) { if (file.isDirectory && excludeParentDirs && dirHasSubDirs(file)) { continue } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index f59f21f9961..717858f1e43 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -50,6 +50,22 @@ import org.jetbrains.kotlinx.atomicfu.AbstractAtomicfuJsIrTest import org.jetbrains.kotlinx.atomicfu.AbstractAtomicfuJvmIrTest import org.junit.jupiter.api.Tag + +private class ExcludePattern { + companion object { + private const val MEMBER_ALIAS = "(^removeMemberTypeAlias)|(^addMemberTypeAlias)" + + private const val ALL_EXPECT = "(^.*Expect.*)" + private const val COMPANION_CONSTANT = "(^companionConstantChanged)" + + internal val forK2 = listOf( + ALL_EXPECT, // KT-63125 - Partially related to single-module expect-actual tests, but regexp is really wide + MEMBER_ALIAS, // KT-55195 - Invalid for K2 + COMPANION_CONSTANT // KT-56242 - Work in progress + ).joinToString("|") + } +} + fun main(args: Array) { System.setProperty("java.awt.headless", "true") generateTestGroupSuite(args) { @@ -69,9 +85,7 @@ fun main(args: Array) { init = incrementalJvmTestData( TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf( - PURE_KOTLIN to "(^.*Expect.*)" - + "|(^removeMemberTypeAlias)|(^addMemberTypeAlias)" //KT-55195 - + "|(^companionConstantChanged)" //KT-56242 + PURE_KOTLIN to ExcludePattern.forK2 ) ) ) @@ -80,9 +94,7 @@ fun main(args: Array) { init = incrementalJvmTestData( TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf( - PURE_KOTLIN to "(^.*Expect.*)" - + "|(^removeMemberTypeAlias)|(^addMemberTypeAlias)" //KT-55195 - + "|(^companionConstantChanged)", //KT-56242 + PURE_KOTLIN to ExcludePattern.forK2, WITH_JAVA to "^classToPackageFacade" // KT-56698 ) ) @@ -91,14 +103,12 @@ fun main(args: Array) { init = incrementalJvmTestData( TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf( - PURE_KOTLIN to "(^.*Expect.*)" - + "|(^removeMemberTypeAlias)|(^addMemberTypeAlias)" //KT-55195 - + "|(^companionConstantChanged)" //KT-56242 + PURE_KOTLIN to ExcludePattern.forK2 ) ) ) - testClass() { + testClass { // IC of sealed interfaces are not supported in JS model("incremental/pureKotlin", extension = null, recursive = false, excludedPattern = "(^sealed.*)|(.*SinceK2)") model("incremental/classHierarchyAffected", extension = null, recursive = false) @@ -124,16 +134,16 @@ fun main(args: Array) { // TODO: https://youtrack.jetbrains.com/issue/KT-61602/JS-K2-ICL-Fix-muted-tests testClass { // IC of sealed interfaces are not supported in JS - model("incremental/pureKotlin", extension = null, recursive = false, + model( + "incremental/pureKotlin", extension = null, recursive = false, // TODO: 'fileWithConstantRemoved' should be fixed in https://youtrack.jetbrains.com/issue/KT-58824 excludedPattern = "^(sealed.*|fileWithConstantRemoved|propertyRedeclaration|funRedeclaration|funVsConstructorOverloadConflict)" ) - model("incremental/classHierarchyAffected", extension = null, recursive = false, + model( + "incremental/classHierarchyAffected", extension = null, recursive = false, excludedPattern = "secondaryConstructorAdded" ) model("incremental/js", extension = null, excludeParentDirs = true) - - //model("incremental/scopeExpansion", extension = null, excludeParentDirs = true) } testClass { @@ -142,11 +152,12 @@ fun main(args: Array) { testClass { model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true) - model("incremental/mpp/jvmOnly", extension = null, excludeParentDirs = true) + model("incremental/mpp/jvmOnlyK1", extension = null, excludeParentDirs = true) } testClass { model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true) } + //TODO: write a proper k2 multiplatform test runner KT-63183 } testGroup( diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md index e662d94a931..d235a2a9b8c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md @@ -34,5 +34,5 @@ Supported dependency flags: - `runtime` - `provided` - `expectedBy` (old MPP) - - `included` (new MPP) - - `exproted` \ No newline at end of file + - `include` (new MPP) + - `exported` \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/args.txt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/args.txt new file mode 100644 index 00000000000..242bf862234 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/args.txt @@ -0,0 +1,2 @@ +-language-version 1.9 +-Xexpect-actual-classes \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/fail.txt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/fail.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/args.txt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/args.txt new file mode 100644 index 00000000000..242bf862234 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/args.txt @@ -0,0 +1,2 @@ +-language-version 1.9 +-Xexpect-actual-classes \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/fail.txt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/fail.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/fail.txt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/fail.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/fail.txt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/fail.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/X.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/X.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/args.txt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/args.txt new file mode 100644 index 00000000000..a3a76671759 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/args.txt @@ -0,0 +1 @@ +-language-version 1.9 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/commonX.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/commonX.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/dummy.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/dummy.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsActual.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsActual.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsActual.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsActual.kt.new diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsNoActual.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/multifilePartChanged/utilsNoActual.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/actualA.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/actualA.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/actualA.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/actualA.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/args.txt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/args.txt new file mode 100644 index 00000000000..e4706c213a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/args.txt @@ -0,0 +1,3 @@ +-Xmulti-platform +-Xexpect-actual-classes +-language-version 1.9 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt.new.1 b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt.new.1 rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt.new.2 b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/b.kt.new.2 rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/b.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/build.log rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/build.log diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/expectA.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/expectA.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/mpp/jvmOnly/optionalExpectationWithActual/expectA.kt rename to jps/jps-plugin/testData/incremental/mpp/jvmOnlyK1/optionalExpectationWithActual/expectA.kt