From d7b290144830619cb11f9f935b549d8f802c973b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 5 Mar 2019 15:36:06 +0300 Subject: [PATCH] Always run codegen when IC is enabled We may need to run code generation when no source files are specified for incremental compilation (to update caches & metadata) Original commit: 97d3d383746db223456b3f6a3a341fc7fc87ab32 --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../testData/incremental/pureKotlin/classRemoved/A.kt | 3 +++ .../incremental/pureKotlin/classRemoved/A.kt.delete.1 | 1 + .../incremental/pureKotlin/classRemoved/build.log | 10 ++++++++++ .../incremental/pureKotlin/classRemoved/other.kt | 4 ++++ 5 files changed, 23 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 52e58a691ab..e8996f4ecd2 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -752,6 +752,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { runTest("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); } + @TestMetadata("classRemoved") + public void testClassRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/classRemoved/"); + } + @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt new file mode 100644 index 00000000000..1b0178fd9be --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt @@ -0,0 +1,3 @@ +package test + +class A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 @@ -0,0 +1 @@ + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log new file mode 100644 index 00000000000..94979d23f97 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log @@ -0,0 +1,10 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt new file mode 100644 index 00000000000..dc156549ce5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt @@ -0,0 +1,4 @@ +package test + +fun other() { +}