From 1301333e37d6cbe0e8b87929f66ca29bedfc86fb Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 22 Nov 2018 09:17:27 +0300 Subject: [PATCH] JPS, tests, minor: rename test files in modules for better readability --- .../multiplatform/custom/buildError/build.log | 12 +++++------ .../custom/buildError/{c_a.kt => c_f.kt} | 0 .../buildError/{c_a.kt.new.1 => c_f.kt.new.1} | 0 .../buildError/{c_a.kt.new.2 => c_f.kt.new.2} | 0 .../buildError/{pJs_c.kt => pJs_fJs.kt} | 0 .../buildError/{pJvm_c.kt => pJvm_fJvm.kt} | 0 .../custom/buildError2Levels/build.log | 20 +++++++++---------- .../buildError2Levels/{c_a.kt => c_f.kt} | 0 .../{c_a.kt.new.1 => c_f.kt.new.1} | 0 .../{c_a.kt.new.2 => c_f.kt.new.2} | 0 .../buildError2Levels/{c_b.kt => c_g.kt} | 0 .../buildError2Levels/{pJs_c.kt => pJs_fg.kt} | 0 .../{pJvm_c.kt => pJvm_fg.kt} | 0 13 files changed, 16 insertions(+), 16 deletions(-) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/{c_a.kt => c_f.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/{c_a.kt.new.1 => c_f.kt.new.1} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/{c_a.kt.new.2 => c_f.kt.new.2} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/{pJs_c.kt => pJs_fJs.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/{pJvm_c.kt => pJvm_fJvm.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{c_a.kt => c_f.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{c_a.kt.new.1 => c_f.kt.new.1} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{c_a.kt.new.2 => c_f.kt.new.2} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{c_b.kt => c_g.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{pJs_c.kt => pJs_fg.kt} (100%) rename jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/{pJvm_c.kt => pJvm_fg.kt} (100%) diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log index c9064d33933..186234f80fb 100644 --- a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log +++ b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log @@ -8,8 +8,8 @@ Cleaning output files: out/production/pJs/pJs/root-package.kjsm End of files Compiling files: - c/src/a.kt - pJs/src/c.kt + c/src/f.kt + pJs/src/fJs.kt End of files Exit code: ABORT ------------------------------------------ @@ -22,8 +22,8 @@ COMPILATION FAILED Building c Building pJs Compiling files: - c/src/a.kt - pJs/src/c.kt + c/src/f.kt + pJs/src/fJs.kt End of files Exit code: OK ------------------------------------------ @@ -32,8 +32,8 @@ Cleaning output files: out/production/pJvm/META-INF/pJvm.kotlin_module End of files Compiling files: - c/src/a.kt - pJvm/src/c.kt + c/src/f.kt + pJvm/src/fJvm.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt.new.1 b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt.new.2 b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_a.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_c.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_c.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_c.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_c.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log index c8917822212..2f051fcd555 100644 --- a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log +++ b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log @@ -8,9 +8,9 @@ Cleaning output files: out/production/pJs/pJs/root-package.kjsm End of files Compiling files: - c/src/a.kt - c/src/b.kt - pJs/src/c.kt + c/src/f.kt + c/src/g.kt + pJs/src/fg.kt End of files Exit code: ABORT ------------------------------------------ @@ -23,22 +23,22 @@ COMPILATION FAILED Building c Building pJs Compiling files: - c/src/a.kt - c/src/b.kt - pJs/src/c.kt + c/src/f.kt + c/src/g.kt + pJs/src/fg.kt End of files Exit code: OK ------------------------------------------ Marked as dirty by Kotlin: - c/src/b.kt + c/src/g.kt Building pJvm Cleaning output files: out/production/pJvm/META-INF/pJvm.kotlin_module End of files Compiling files: - c/src/a.kt - c/src/b.kt - pJvm/src/c.kt + c/src/f.kt + c/src/g.kt + pJvm/src/fg.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt.new.1 b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt.new.2 b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_a.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_b.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_b.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_c.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_c.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_c.kt b/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_c.kt rename to jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt