From 743c59331dc0cfe1b894bbae5970cd37519dbd32 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 25 Sep 2015 19:50:10 +0300 Subject: [PATCH] Remove tests on turning incremental on/off temporary --- .../IncrementalLazyCachesTestGenerated.java | 12 ----- .../incrementalCompilationOff/build.log | 26 --------- .../dependencies.txt | 3 -- .../expected-kotlin-caches.txt | 4 -- .../incrementalCompilationOff/module1_a.kt | 3 -- .../module1_a.kt.new | 5 -- .../module1_incremental_compilation_off.new | 0 .../module1_other.kt | 3 -- .../incrementalCompilationOff/module2_B.java | 5 -- .../incrementalCompilationOff/module3_c.kt | 3 -- .../incrementalCompilationOffOn/build.log | 54 ------------------- .../dependencies.txt | 3 -- .../expected-kotlin-caches.txt | 15 ------ .../incrementalCompilationOffOn/module1_a.kt | 3 -- .../module1_a.kt.new.1 | 5 -- .../module1_a.kt.new.2 | 5 -- ...dule1_incremental_compilation_off.delete.2 | 0 .../module1_incremental_compilation_off.new.1 | 0 .../module1_other.kt | 3 -- .../module2_B.java | 5 -- .../incrementalCompilationOffOn/module3_c.kt | 3 -- 21 files changed, 160 deletions(-) delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index de1baab420c..2460cccbdca 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -53,18 +53,6 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } - @TestMetadata("incrementalCompilationOff") - public void testIncrementalCompilationOff() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/"); - doTest(fileName); - } - - @TestMetadata("incrementalCompilationOffOn") - public void testIncrementalCompilationOffOn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/"); - doTest(fileName); - } - @TestMetadata("inlineFunctionWithUsage") public void testInlineFunctionWithUsage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log deleted file mode 100644 index 7cf680292e1..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log +++ /dev/null @@ -1,26 +0,0 @@ -Cleaning output files: -out/production/module1/module1/A.class -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3Package.class -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt deleted file mode 100644 index 42b512b6648..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt +++ /dev/null @@ -1,3 +0,0 @@ -module1-> -module2->module1 -module3-> \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt deleted file mode 100644 index 469e8d85401..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt +++ /dev/null @@ -1,4 +0,0 @@ -Module 'module1' production -Module 'module1' tests -Module 'module2' production -Module 'module2' tests \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt deleted file mode 100644 index 92cc446cfe0..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt deleted file mode 100644 index fbf512b4fa3..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java deleted file mode 100644 index 0f61b4f1a9b..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java +++ /dev/null @@ -1,5 +0,0 @@ -class B { - void f() { - new module1.A(); - } -} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt deleted file mode 100644 index c7cd3fc4b22..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module3 - -fun c() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log deleted file mode 100644 index d3894733f30..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log +++ /dev/null @@ -1,54 +0,0 @@ -Cleaning output files: -out/production/module1/module1/A.class -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3Package.class -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files - - -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class -End of files -Compiling files: -module1/src/module1_a.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt deleted file mode 100644 index 42b512b6648..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt +++ /dev/null @@ -1,3 +0,0 @@ -module1-> -module2->module1 -module3-> \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt deleted file mode 100644 index a6be44610e6..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt +++ /dev/null @@ -1,15 +0,0 @@ -Module 'module1' production - format-version.txt - inline-functions.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module1' tests -Module 'module2' production -Module 'module2' tests -Module 'module3' production - format-version.txt - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module3' tests \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt deleted file mode 100644 index 92cc446cfe0..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt deleted file mode 100644 index fbf512b4fa3..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java deleted file mode 100644 index 0f61b4f1a9b..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java +++ /dev/null @@ -1,5 +0,0 @@ -class B { - void f() { - new module1.A(); - } -} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt deleted file mode 100644 index c7cd3fc4b22..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module3 - -fun c() {} \ No newline at end of file