azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old IC: update on-off tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-04-27 12:50:01 +03:00
parent e7afb073d9
commit 8143ca158b
50 changed files with 133 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -4
View File
@@ -1194,6 +1194,7 @@ fun main(args: Array<String>) {
testClass(AbstractIncrementalLazyCachesTest::class.java) {
model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true)
model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true)
}
testClass(AbstractIncrementalCacheVersionChangedTest::class.java) {
@@ -1217,10 +1218,6 @@ fun main(args: Array<String>) {
testClass<AbstractDataContainerVersionChangedTest> {
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
}
testClass<AbstractExperimentalChangeIncrementalOptionTest> {
model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true)
}
}
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
-3
View File
@@ -54,9 +54,6 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
name.endsWith("incremental-compilation") -> {
IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool())
}
name.endsWith("experimental-compilation") -> {
IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool())
}
}
}
}
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java
-74
View File
@@ -1,74 +0,0 @@
/*
* Copyright 2010-2017 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.jps.build;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
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.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class ExperimentalChangeIncrementalOptionTestGenerated extends AbstractExperimentalChangeIncrementalOptionTest {
public void testAllFilesPresentInChangeIncrementalOption() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
}
@TestMetadata("experimentalOn")
public void testExperimentalOn() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/");
doTest(fileName);
}
@TestMetadata("experimentalOnJavaChanged")
public void testExperimentalOnJavaChanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/");
doTest(fileName);
}
@TestMetadata("experimentalOnJavaOnly")
public void testExperimentalOnJavaOnly() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/");
doTest(fileName);
}
@TestMetadata("experimentalOnOff")
public void testExperimentalOnOff() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/");
doTest(fileName);
}
@TestMetadata("incrementalOff")
public void testIncrementalOff() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/");
doTest(fileName);
}
@TestMetadata("incrementalOffOn")
public void testIncrementalOffOn() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/");
doTest(fileName);
}
}
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
+83 -46
View File
@@ -28,59 +28,96 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest {
public void testAllFilesPresentInLazyKotlinCaches() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
@TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class LazyKotlinCaches extends AbstractIncrementalLazyCachesTest {
public void testAllFilesPresentInLazyKotlinCaches() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
}
@TestMetadata("class")
public void testClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/");
doTest(fileName);
}
@TestMetadata("classInheritance")
public void testClassInheritance() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/");
doTest(fileName);
}
@TestMetadata("constant")
public void testConstant() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/");
doTest(fileName);
}
@TestMetadata("function")
public void testFunction() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/");
doTest(fileName);
}
@TestMetadata("inlineFunctionWithUsage")
public void testInlineFunctionWithUsage() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/");
doTest(fileName);
}
@TestMetadata("inlineFunctionWithoutUsage")
public void testInlineFunctionWithoutUsage() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/");
doTest(fileName);
}
@TestMetadata("noKotlin")
public void testNoKotlin() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/");
doTest(fileName);
}
@TestMetadata("topLevelPropertyAccess")
public void testTopLevelPropertyAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
doTest(fileName);
}
}
@TestMetadata("class")
public void testClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/");
doTest(fileName);
}
@TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ChangeIncrementalOption extends AbstractIncrementalLazyCachesTest {
public void testAllFilesPresentInChangeIncrementalOption() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
}
@TestMetadata("classInheritance")
public void testClassInheritance() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/");
doTest(fileName);
}
@TestMetadata("incrementalOff")
public void testIncrementalOff() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/");
doTest(fileName);
}
@TestMetadata("constant")
public void testConstant() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/");
doTest(fileName);
}
@TestMetadata("incrementalOffOn")
public void testIncrementalOffOn() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/");
doTest(fileName);
}
@TestMetadata("function")
public void testFunction() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/");
doTest(fileName);
}
@TestMetadata("incrementalOffOnJavaChanged")
public void testIncrementalOffOnJavaChanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/");
doTest(fileName);
}
@TestMetadata("inlineFunctionWithUsage")
public void testInlineFunctionWithUsage() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/");
doTest(fileName);
}
@TestMetadata("inlineFunctionWithoutUsage")
public void testInlineFunctionWithoutUsage() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/");
doTest(fileName);
}
@TestMetadata("noKotlin")
public void testNoKotlin() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/");
doTest(fileName);
}
@TestMetadata("topLevelPropertyAccess")
public void testTopLevelPropertyAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
doTest(fileName);
@TestMetadata("incrementalOffOnJavaOnly")
public void testIncrementalOffOnJavaOnly() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/");
doTest(fileName);
}
}
}
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
-2
View File
@@ -22,8 +22,6 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest()
abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest()
abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() {
override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable<ModuleBuildTarget>) =
targets.map { cacheVersionProvider.experimentalVersion(it) }
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log
Vendored
-80
View File
@@ -1,80 +0,0 @@
================ Step #1 =================
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module1/foo/Z.class
End of files
Compiling files:
module1/src/z.kt
End of files
Marked as dirty by Kotlin:
module1/src/z.kt
module2/src/a.kt
module2/src/b.kt
module2/src/c.kt
module3/src/d.kt
module4/src/e.kt
Exit code: OK
------------------------------------------
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
out/production/module2/foo/AKt.class
out/production/module2/foo/B.class
out/production/module2/foo/BKt.class
out/production/module2/foo/C.class
out/production/module2/foo/CKt.class
End of files
Compiling files:
module2/src/a.kt
module2/src/b.kt
module2/src/c.kt
End of files
Exit code: OK
------------------------------------------
Building module3
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module3/foo/D.class
End of files
Compiling files:
module3/src/d.kt
End of files
Exit code: OK
------------------------------------------
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/foo/E.class
End of files
Compiling files:
module4/src/e.kt
End of files
Exit code: OK
------------------------------------------
================ Step #2 =================
Building module1
Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
out/production/module2/foo/AKt.class
End of files
Compiling files:
module2/src/a.kt
End of files
Exit code: OK
------------------------------------------
Building module3
Exit code: NOTHING_DONE
------------------------------------------
Building module4
Exit code: NOTHING_DONE
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt
Vendored
-4
View File
@@ -1,4 +0,0 @@
module1->
module2->module1
module3->module2
module4->module3
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt
Vendored
-45
View File
@@ -1,45 +0,0 @@
kotlin-data-container
data-container-format-version.txt
counters.tab
file-to-id.tab
id-to-file.tab
lookups.tab
Module 'module1' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module1' tests
Module 'module2' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
package-parts.tab
proto.tab
source-to-classes.tab
subtypes.tab
supertypes.tab
Module 'module2' tests
Module 'module3' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module3' tests
Module 'module4' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module4' tests
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class Z
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun a(): Int = 0
open class A
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.1
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.2
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_b.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun b(): Int = a()
open class B : A()
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_c.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun c(): Int = b()
open class C : B()
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class D
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class E
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java.touch
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/experimental-compilation.new
Vendored
-1
View File
@@ -1 +0,0 @@
on
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log
Vendored
-117
View File
@@ -1,117 +0,0 @@
================ Step #1 =================
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module1/foo/Z.class
End of files
Compiling files:
module1/src/z.kt
End of files
Marked as dirty by Kotlin:
module1/src/z.kt
module2/src/a.kt
module2/src/b.kt
module2/src/c.kt
module3/src/d.kt
module4/src/e.kt
Exit code: OK
------------------------------------------
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
out/production/module2/foo/AKt.class
out/production/module2/foo/B.class
out/production/module2/foo/BKt.class
out/production/module2/foo/C.class
out/production/module2/foo/CKt.class
End of files
Compiling files:
module2/src/a.kt
module2/src/b.kt
module2/src/c.kt
End of files
Exit code: OK
------------------------------------------
Building module3
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module3/foo/D.class
End of files
Compiling files:
module3/src/d.kt
End of files
Exit code: OK
------------------------------------------
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/foo/E.class
End of files
Compiling files:
module4/src/e.kt
End of files
Exit code: OK
------------------------------------------
================ Step #2 =================
Building module1
Actions after cache changed: [CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER, DO_NOTHING]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
out/production/module2/foo/AKt.class
End of files
Compiling files:
module2/src/a.kt
End of files
Exit code: OK
------------------------------------------
Building module3
Exit code: NOTHING_DONE
------------------------------------------
Building module4
Exit code: NOTHING_DONE
------------------------------------------
================ Step #3 =================
Building module1
Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
out/production/module2/foo/AKt.class
End of files
Compiling files:
module2/src/a.kt
End of files
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/B.class
out/production/module2/foo/BKt.class
out/production/module2/foo/C.class
out/production/module2/foo/CKt.class
End of files
Compiling files:
module2/src/b.kt
module2/src/c.kt
End of files
Exit code: OK
------------------------------------------
Building module3
Exit code: NOTHING_DONE
------------------------------------------
Building module4
Exit code: NOTHING_DONE
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt
Vendored
-4
View File
@@ -1,4 +0,0 @@
module1->
module2->module1
module3->module2
module4->module3
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt
Vendored
-26
View File
@@ -1,26 +0,0 @@
kotlin-data-container
Module 'module1' production
format-version.txt
jvm-build-meta-info.txt
proto.tab
source-to-classes.tab
Module 'module1' tests
Module 'module2' production
format-version.txt
jvm-build-meta-info.txt
package-parts.tab
proto.tab
source-to-classes.tab
Module 'module2' tests
Module 'module3' production
format-version.txt
jvm-build-meta-info.txt
proto.tab
source-to-classes.tab
Module 'module3' tests
Module 'module4' production
format-version.txt
jvm-build-meta-info.txt
proto.tab
source-to-classes.tab
Module 'module4' tests
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class Z
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun a(): Int = 0
open class A
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.new.3
Vendored
-7
View File
@@ -1,7 +0,0 @@
package foo
fun a(): Int = 0
fun aa() = 1
open class A
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.1
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.2
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_b.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun b(): Int = a()
open class B : A()
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_c.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package foo
fun c(): Int = b()
open class C : B()
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1
Vendored
-1
View File
@@ -1 +0,0 @@
on
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class D
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
class E
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
================ Step #1 =================
Building module1
Actions after cache changed: [CLEAN_NORMAL_CACHES, DO_NOTHING]
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
@@ -45,4 +45,4 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module4
Exit code: NOTHING_DONE
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
Vendored
+10 -3
View File
@@ -1,7 +1,7 @@
================ Step #1 =================
Building module1
Actions after cache changed: [CLEAN_NORMAL_CACHES, DO_NOTHING]
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
@@ -26,13 +26,20 @@ Exit code: NOTHING_DONE
================ Step #2 =================
Building module1
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK]
Cleaning output files:
out/production/module1/foo/Z.class
End of files
Compiling files:
module1/src/z.kt
End of files
Marked as dirty by Kotlin:
module1/src/z.kt
module2/src/a.kt
module2/src/b.kt
module2/src/c.kt
module3/src/d.kt
module4/src/e.kt
Exit code: OK
------------------------------------------
Building module2
@@ -102,4 +109,4 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module4
Exit code: NOTHING_DONE
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
Vendored
+16 -1
View File
@@ -1,28 +1,43 @@
kotlin-data-container
data-container-format-version.txt
counters.tab
file-to-id.tab
id-to-file.tab
lookups.tab
Module 'module1' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module1' tests
Module 'module2' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
inline-functions.tab
inlined-to.tab
internal-name-to-source.tab
package-parts.tab
proto.tab
source-to-classes.tab
Module 'module2' tests
Module 'module3' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module3' tests
Module 'module4' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
class-fq-name-to-source.tab
internal-name-to-source.tab
proto.tab
source-to-classes.tab
Module 'module4' tests
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
Vendored
+15 -2
View File
@@ -1,7 +1,20 @@
================ Step #1 =================
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING]
Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_DATA_CONTAINER]
Exit code: NOTHING_DONE
------------------------------------------
Building module2
Exit code: NOTHING_DONE
------------------------------------------
Building module3
Exit code: NOTHING_DONE
------------------------------------------
================ Step #2 =================
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK]
Cleaning output files:
out/production/module1/AKt.class
out/production/module1/META-INF/module1.kotlin_module
@@ -40,4 +53,4 @@ Compiling files:
module3/src/d.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
Vendored
-3
View File
@@ -5,7 +5,6 @@ kotlin-data-container
id-to-file.tab
lookups.tab
Module 'module1' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
internal-name-to-source.tab
@@ -14,7 +13,6 @@ Module 'module1' production
source-to-classes.tab
Module 'module1' tests
Module 'module2' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
internal-name-to-source.tab
@@ -23,7 +21,6 @@ Module 'module2' production
source-to-classes.tab
Module 'module2' tests
Module 'module3' production
experimental-format-version.txt
format-version.txt
jvm-build-meta-info.txt
internal-name-to-source.tab
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.2 → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_experimental-compilation.new.1 → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
Vendored
+5 -6
View File
@@ -1,10 +1,9 @@
================ Step #1 =================
Cleaning output files:
out/production/module/A.class
End of files
Exit code: NOTHING_DONE
------------------------------------------
Compiling files:
src/A.java
End of files
================ Step #2 =================
Exit code: NOTHING_DONE
------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
Vendored
View File
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
Vendored
+1
View File
@@ -0,0 +1 @@
off
jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_experimental-compilation.new → jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
Vendored
View File