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

JPS: remove cache version from test data

Browse Source
This commit is contained in:
Sergey Rostov
2019-01-09 12:31:45 +03:00
parent b6aed5b98a
commit b3985d2735
22 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+1 -1
View File
@@ -575,7 +575,7 @@ abstract class AbstractIncrementalJpsTest(
else -> error("Unknown cache manager $cacheManager") else -> error("Unknown cache manager $cacheManager")
} }
logLine("$cacheTitle are $attributesDiff") logLine("$cacheTitle are ${attributesDiff.status}")
} }
override fun markedAsDirtyBeforeRound(files: Iterable<File>) { override fun markedAsDirtyBeforeRound(files: Iterable<File>) {
jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
================ Step #1 ================= ================ Step #1 =================
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
Cleaning output files: Cleaning output files:
@@ -14,7 +14,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/B.kt module2/src/B.kt
Cleaning output files: Cleaning output files:
@@ -27,7 +27,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module3 Building module3
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module3/src/C.kt module3/src/C.kt
Cleaning output files: Cleaning output files:
@@ -40,7 +40,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module4 Building module4
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module4/src/D.kt module4/src/D.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
module2/src/B.kt module2/src/B.kt
jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
Vendored
+4 -4
View File
@@ -4,7 +4,7 @@ Building module5
Exit code: NOTHING_DONE Exit code: NOTHING_DONE
------------------------------------------ ------------------------------------------
Building module4 Building module4
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module4/src/d.kt module4/src/d.kt
Cleaning output files: Cleaning output files:
@@ -17,7 +17,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
Cleaning output files: Cleaning output files:
@@ -31,7 +31,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/b.kt module2/src/b.kt
Cleaning output files: Cleaning output files:
@@ -44,7 +44,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module3 Building module3
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module3/src/c.kt module3/src/c.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
module2/src/b.kt module2/src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
================ Step #1 ================= ================ Step #1 =================
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
Cleaning output files: Cleaning output files:
@@ -15,7 +15,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/b.kt module2/src/b.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
module2/src/b.kt module2/src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
================ Step #1 ================= ================ Step #1 =================
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
Cleaning output files: Cleaning output files:
@@ -14,7 +14,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/B.kt module2/src/B.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
module2/src/B.kt module2/src/B.kt
jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
================ Step #1 ================= ================ Step #1 =================
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
Cleaning output files: Cleaning output files:
@@ -15,7 +15,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/B.kt module2/src/B.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/A.kt module1/src/A.kt
module2/src/B.kt module2/src/B.kt
jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/a.kt src/a.kt
src/b.kt src/b.kt
jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
Vendored
+4 -4
View File
@@ -4,7 +4,7 @@ Building module5
Exit code: NOTHING_DONE Exit code: NOTHING_DONE
------------------------------------------ ------------------------------------------
Building module4 Building module4
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module4/src/d.kt module4/src/d.kt
Cleaning output files: Cleaning output files:
@@ -17,7 +17,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module1 Building module1
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
module1/src/f.kt module1/src/f.kt
@@ -52,7 +52,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module2 Building module2
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module2/src/b.kt module2/src/b.kt
Cleaning output files: Cleaning output files:
@@ -65,7 +65,7 @@ End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------
Building module3 Building module3
Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID: actual=CacheVersion(version=777) -> expected=CacheVersion(version=9011001) Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module3/src/c.kt module3/src/c.kt
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
================ Step #1 add file with compilation error to module1 ================= ================ Step #1 add file with compilation error to module1 =================
Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
module1/src/f.kt module1/src/f.kt
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
Vendored
+5 -5
View File
@@ -1,10 +1,10 @@
================ Step #1 change module2 and disable incremental compilation ================= ================ Step #1 change module2 and disable incremental compilation =================
Lookups cache are SHOULD_BE_CLEARED: actual=(3011001, [jvm]) -> expected=null Lookups cache are SHOULD_BE_CLEARED
Local cache for Module 'module1' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module1' production are SHOULD_BE_CLEARED
Local cache for Module 'module2' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module2' production are SHOULD_BE_CLEARED
Local cache for Module 'module3' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module3' production are SHOULD_BE_CLEARED
Local cache for Module 'module4' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module4' production are SHOULD_BE_CLEARED
Building module1 Building module1
Exit code: NOTHING_DONE Exit code: NOTHING_DONE
------------------------------------------ ------------------------------------------
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
Vendored
+6 -6
View File
@@ -1,10 +1,10 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are SHOULD_BE_CLEARED: actual=(3011001, [jvm]) -> expected=null Lookups cache are SHOULD_BE_CLEARED
Local cache for Module 'module1' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module1' production are SHOULD_BE_CLEARED
Local cache for Module 'module2' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module2' production are SHOULD_BE_CLEARED
Local cache for Module 'module3' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module3' production are SHOULD_BE_CLEARED
Local cache for Module 'module4' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module4' production are SHOULD_BE_CLEARED
Building module1 Building module1
Exit code: NOTHING_DONE Exit code: NOTHING_DONE
------------------------------------------ ------------------------------------------
@@ -35,7 +35,7 @@ Exit code: NOTHING_DONE
================ Step #2 ================= ================ Step #2 =================
Lookups cache are INVALID: actual=null -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/z.kt module1/src/z.kt
module2/src/a.kt module2/src/a.kt
jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
================ Step #1 ================= ================ Step #1 =================
Lookups cache are SHOULD_BE_CLEARED: actual=(3011001, [jvm]) -> expected=null Lookups cache are SHOULD_BE_CLEARED
Local cache for Module 'module1' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module1' production are SHOULD_BE_CLEARED
Local cache for Module 'module2' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module2' production are SHOULD_BE_CLEARED
Local cache for Module 'module3' production are SHOULD_BE_CLEARED: actual=CacheVersion(version=9011001) -> expected=null Local cache for Module 'module3' production are SHOULD_BE_CLEARED
Building module1 Building module1
Exit code: NOTHING_DONE Exit code: NOTHING_DONE
------------------------------------------ ------------------------------------------
@@ -16,7 +16,7 @@ Exit code: NOTHING_DONE
================ Step #2 ================= ================ Step #2 =================
Lookups cache are INVALID: actual=null -> expected=(3011001, [jvm]) Lookups cache are INVALID
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
module1/src/a.kt module1/src/a.kt
module2/src/c.kt module2/src/c.kt