From 4000eda3da987520dfde205b4808ed536083c07a Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 8 Aug 2017 19:04:18 +0200
Subject: [PATCH] junit tests: keep output directories

---
 .../junit/configurations/outputs/general 1/keep.dir       | 0
 .../junit/configurations/outputs/general 2/keep.dir       | 0
 .../junit/configurations/outputs/general 3/keep.dir       | 0
 .../junit/configurations/outputs/general 4/keep.dir       | 0
 .../testData/junit/configurations/outputs/tests1/keep.dir | 0
 .../testData/junit/configurations/outputs/tests2/keep.dir | 0
 .../testData/junit/configurations/outputs/tests3/keep.dir | 0
 .../testData/junit/configurations/outputs/tests4/keep.dir | 0
 .../com/intellij/java/execution/ConfigurationsTest.java   | 8 +++++---
 9 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/general 1/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/general 2/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/general 3/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/general 4/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/tests1/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/tests2/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/tests3/keep.dir
 create mode 100644 java/java-tests/testData/junit/configurations/outputs/tests4/keep.dir

diff --git a/java/java-tests/testData/junit/configurations/outputs/general 1/keep.dir b/java/java-tests/testData/junit/configurations/outputs/general 1/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/general 2/keep.dir b/java/java-tests/testData/junit/configurations/outputs/general 2/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/general 3/keep.dir b/java/java-tests/testData/junit/configurations/outputs/general 3/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/general 4/keep.dir b/java/java-tests/testData/junit/configurations/outputs/general 4/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/tests1/keep.dir b/java/java-tests/testData/junit/configurations/outputs/tests1/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/tests2/keep.dir b/java/java-tests/testData/junit/configurations/outputs/tests2/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/tests3/keep.dir b/java/java-tests/testData/junit/configurations/outputs/tests3/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testData/junit/configurations/outputs/tests4/keep.dir b/java/java-tests/testData/junit/configurations/outputs/tests4/keep.dir
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java b/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java
index 801f15f94e3b..a26edd51b04b 100644
--- a/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java
@@ -459,8 +459,10 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
     Disposer.register(getTestRootDisposable(), new Disposable() {
       @Override
       public void dispose() {
-        FileUtil.delete(new File(outputs[0]));
-        FileUtil.delete(new File(outputs[1]));
+        for (File file : new File(outputs[1]).listFiles()) {
+          if (file.getName().equals("keep.dir")) continue;
+          FileUtil.delete(file);
+        }
       }
     });
     return outputs;
@@ -480,7 +482,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
       try {
         CompilerTester tester = new CompilerTester(project, Arrays.asList(ModuleManager.getInstance(project).getModules()));
         try {
-          tester.rebuild();
+          tester.make();
           task.startSearch();
         }
         finally {