From 2b8ca60c05e40fd158d6bca633ad75901cea88b1 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Tue, 7 Aug 2018 18:58:23 +0300
Subject: [PATCH] Add SKIP_JAVAC in tests where behaviour has diverged with
 IDEA resolve

See a71f09022c4723821d5058f9066dfb2a735df730
---
 .../javac/diagnostics/tests/imports/ClassImportsConflicting.kt | 1 +
 .../diagnostics/tests/imports/NestedAndTopLevelClassClash.kt   | 1 +
 .../javac/diagnostics/tests/imports/NestedClassClash.kt        | 1 +
 .../jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.kt b/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.kt
index 6be1ea2d0be..219a36fd843 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.kt
+++ b/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.kt
@@ -1,3 +1,4 @@
+// SKIP_JAVAC
 // FILE: b.kt
 package b
 
diff --git a/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.kt b/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.kt
index 0a0b01dc673..6661cb0aa83 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.kt
+++ b/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.kt
@@ -1,3 +1,4 @@
+// SKIP_JAVAC
 // FILE: a/B.java
 package a;
 
diff --git a/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.kt b/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.kt
index 5c87f114623..1c9a491d6e5 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.kt
+++ b/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.kt
@@ -1,3 +1,4 @@
+// SKIP_JAVAC
 // FILE: a/A.java
 package a;
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
index fa1a4e02b25..1ccc94e5054 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
@@ -131,6 +131,9 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase
     protected void doTest(String filePath) throws Exception {
         File file = new File(filePath);
         String expectedText = KotlinTestUtils.doLoadFile(file);
+
+        if (InTextDirectivesUtils.isDirectiveDefined(expectedText, "// SKIP_JAVAC")) return;
+
         Map<String, ModuleAndDependencies> modules = new HashMap<>();
         List<F> testFiles = createTestFiles(file, expectedText, modules);