From ff1ed0c368e0a8c93d428b7de7e6a9e00a558373 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 2 Dec 2015 13:34:45 +0300
Subject: [PATCH] set java temp dir to TeamCity' one (which clears
 automatically)

---
 build/scripts/common_tests.gant                   | 11 ++++-------
 platform/testFramework/src/_FirstInSuiteTest.java |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 2d0bfc73409b..5d91366077cf 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -26,12 +26,6 @@ target(compile: "Compile project") {
     fileset(dir: "$home/bin", includes: "*.hprof")
   }
 
-  def countTemp = new File(p("java.io.tmpdir")).list().length
-  print ("Deleting tmp dir "+p("java.io.tmpdir") + " ("+countTemp+" files)")
-  ant.delete(failonerror: false) {
-    fileset(dir: p("java.io.tmpdir"), includes: "*")
-  }
-
   loadProject()
   prepareOutputFolder()
 
@@ -74,10 +68,13 @@ target('run_tests': 'Run java tests') {
       "idea.test.patterns",
       "idea.fast.only",
       "idea.coverage.enabled.build",
-      "teamcity.build.tempDir",
       "teamcity.tests.recentlyFailedTests.file"
     ].each { pass(jvmArgs, it) }
 
+    def tempDir = p("teamcity.build.tempDir", p("java.io.tmpdir"))
+    jvmArgs << "-Djava.io.tmpdir=${tempDir}"
+    jvmArgs << "-Dteamcity.build.tempDir=${tempDir}"
+
     System.getProperties().entrySet().each {
       if (it.key.startsWith("pass.")) {
         def trimmed = it.key.substring("pass.".length());
diff --git a/platform/testFramework/src/_FirstInSuiteTest.java b/platform/testFramework/src/_FirstInSuiteTest.java
index 41d828271f6e..a78918888ea5 100644
--- a/platform/testFramework/src/_FirstInSuiteTest.java
+++ b/platform/testFramework/src/_FirstInSuiteTest.java
@@ -15,10 +15,12 @@
  */
 
 import com.intellij.TestAll;
+import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.testFramework.TestRunnerUtil;
 import junit.framework.TestCase;
 
 import javax.swing.*;
+import java.io.File;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -71,6 +73,9 @@ public class _FirstInSuiteTest extends TestCase {
 
     // force platform JNA load
     Class.forName("com.sun.jna.Native");
+
+    String tempDirectory = FileUtilRt.getTempDirectory();
+    System.out.println("FileUtil.getTempDirectory() = " + tempDirectory + " ("+new File(tempDirectory).list().length+" files)");
   }
 
   // performance tests