From daf1da1c70a6e684a28ee17958c32ad389f3735e Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Wed, 2 Dec 2020 13:34:17 +0300 Subject: [PATCH] [KLIB IC] Fix klib IC test data Since neither inline function nor super classes affect klib there is no need for extra passes so compiler doesn't report any dirty files. Do not check that. --- .../common/exportedDependency/klib-build.log | 52 ++++++++++++++ .../inlineFunctionInlined/klib-build.log | 23 +++++++ .../klib-build.log | 47 +++++++++++++ .../multiModule/common/simple/klib-build.log | 67 +++++++++++++++++++ .../common/transitiveInlining/klib-build.log | 6 ++ 5 files changed, 195 insertions(+) create mode 100644 jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log create mode 100644 jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log create mode 100644 jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log create mode 100644 jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log create mode 100644 jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log new file mode 100644 index 00000000000..a5954d01354 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log new file mode 100644 index 00000000000..06fe308234d --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineKt.class +End of files +Compiling files: + module1/src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log new file mode 100644 index 00000000000..05389d4d132 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log @@ -0,0 +1,47 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineFKt.class +End of files +Compiling files: + module1/src/inlineF.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageFKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineGKt.class +End of files +Compiling files: + module1/src/inlineG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageGKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log b/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log new file mode 100644 index 00000000000..199d0044d5e --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log @@ -0,0 +1,67 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A +Cannot access 'A': it is private in file + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log new file mode 100644 index 00000000000..a61128f2c4c --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log @@ -0,0 +1,6 @@ +================ Step #1 ================= + +Compiling files: + module1/src/a.kt +End of files +Exit code: OK