From e99513da07ca0fa8136156f765462024a168a4ae Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 11 Feb 2016 23:07:41 +0300 Subject: [PATCH] New IC: don't fail on unsupported difference kinds and process SUPERTYPE_ID_LIST correctly Original commit: 05eff9028f7b75c087986a4ed79a1108a91fce36 --- .../jps/build/incrementalCustomTests.kt | 31 +++++++++++++++++++ .../incremental/custom/renameModule/build.log | 18 +++++++++++ .../incremental/custom/renameModule/test.kt | 5 +++ .../custom/renameModule/test.kt.touch | 0 .../custom/renameModule/unrelated.kt | 4 +++ .../incremental/custom/renameModule/usage.kt | 6 ++++ 6 files changed, 64 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/test.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt new file mode 100644 index 00000000000..d5c0af29a9e --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.jps.build + +open class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() { + fun testRenameModule() { + doTest("jps-plugin/testData/incremental/custom/renameModule/") + } + + override fun performAdditionalModifications(modifications: List) { + projectDescriptor.project.modules.forEach { it.name += "Renamed" } + } +} + +class ExperimentalIncrementalRenameModuleTest : IncrementalRenameModuleTest() { + override val enableExperimentalIncrementalCompilation = true +} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/build.log b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log new file mode 100644 index 00000000000..5b9b113b83b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log @@ -0,0 +1,18 @@ +================ Step #1 ================= + +Compiling files: + src/test.kt + src/unrelated.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/moduleRenamed/META-INF/moduleRenamed.kotlin_module + out/production/moduleRenamed/test/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt new file mode 100644 index 00000000000..e10864dc984 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt @@ -0,0 +1,5 @@ +package test + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt new file mode 100644 index 00000000000..8a9fa61e315 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt @@ -0,0 +1,4 @@ +package unrelated + +fun doSomething() { +} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt new file mode 100644 index 00000000000..7805cf82546 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt @@ -0,0 +1,6 @@ +package test + +fun usage() { + Foo() + bar() +}