From 8683fce476a5ac8bce25f7013d12ec62f23d1817 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 12 Dec 2017 15:14:08 +0300 Subject: [PATCH] Turn off class redeclaration test for JS IC temporarily So the tests could be run on TC. Turn on after KT-19846 is fixed. Original commit: 50bf74b909c4b9711820f2965f3c5945e3156c71 --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++------ .../other}/classRedeclaration/build.log | 0 .../other}/classRedeclaration/class1.kt | 0 .../other}/classRedeclaration/class2.kt.new | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename jps/jps-plugin/testData/incremental/{pureKotlin => withJava/other}/classRedeclaration/build.log (100%) rename jps/jps-plugin/testData/incremental/{pureKotlin => withJava/other}/classRedeclaration/class1.kt (100%) rename jps/jps-plugin/testData/incremental/{pureKotlin => withJava/other}/classRedeclaration/class2.kt.new (100%) 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 1a90efdc7cd..aa9f09244f8 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 @@ -293,12 +293,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("classRedeclaration") - public void testClassRedeclaration() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); - doTest(fileName); - } - @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); @@ -1204,6 +1198,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("classRedeclaration") + public void testClassRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/classRedeclaration/"); + doTest(fileName); + } + @TestMetadata("classToPackageFacade") public void testClassToPackageFacade() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/classToPackageFacade/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new