From fb62d945aa80c4aa9011ea80ff197fef8a2f574f Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 7 Jul 2015 23:09:22 -0400
Subject: [PATCH] isolate integ tests a little better.

They are mostly just ES clients, but we can set tempdir and the usual
stuff to contain them better.
---
 dev-tools/src/main/resources/ant/integration-tests.xml | 3 ---
 pom.xml                                                | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index e2b04c45098..5e50481c594 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -6,9 +6,6 @@
     <istrue value="${skip.integ.tests}"/>
   </condition>
 
-  <!-- this is our working area -->
-  <property name="integ.scratch" location="${project.build.directory}/integ-tests"/>
-
   <!-- our pid file for easy cleanup -->
   <property name="integ.pidfile" location="${integ.scratch}/es.pid"/>
 
diff --git a/pom.xml b/pom.xml
index 3cbb8c58caa..3cb463d4bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,8 @@
         <tests.ifNoTests>fail</tests.ifNoTests>
         <skip.unit.tests>${skipTests}</skip.unit.tests>
         <skip.integ.tests>${skipTests}</skip.integ.tests>
+        <integ.scratch>${project.build.directory}/integ-tests</integ.scratch>
+        <integ.temp>${integ.scratch}/temp</integ.temp>
     </properties>
 
     <repositories>
@@ -705,6 +707,7 @@
                            <tests.rest.blacklist>${tests.rest.blacklist}</tests.rest.blacklist>
                            <tests.rest.spec>${tests.rest.spec}</tests.rest.spec>
                            <tests.rest.load_packaged>${tests.rest.load_packaged}</tests.rest.load_packaged>
+                           <java.io.tmpdir>${integ.temp}</java.io.tmpdir>
                        </systemPropertyVariables>
                     </configuration>
                     <executions>