From b44a2140f88e49ac533bb1cfe3db4308929a33ea Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Thu, 30 Apr 2020 13:28:31 +0200
Subject: [PATCH] Make all test targets declare the temp directory
 (java.io.tmpdir) as defined by tmp.dir

 patch by Mick Semb Wever; reviewed by Berenguer Blasi, Ekaterina Dimitrova for CASSANDRA-15777
---
 build.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index ed9c1a2e7f..6bef406c74 100644
--- a/build.xml
+++ b/build.xml
@@ -1269,6 +1269,7 @@
         <!-- Cassandra 3.0+ needs <jvmarg line="... ${additionalagent}" /> here! (not value=) -->
         <jvmarg line="-javaagent:${basedir}/lib/jamm-0.3.0.jar ${additionalagent}" />
         <jvmarg value="-ea"/>
+        <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
         <jvmarg value="-Dcassandra.debugrefcount=true"/>
         <jvmarg value="-Xss256k"/>
         <!-- When we do classloader manipulation SoftReferences can cause memory leaks
@@ -1357,7 +1358,6 @@
       <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
     <fileset dir="${test.unit.src}">
@@ -1825,7 +1825,6 @@
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
       <jvmarg value="-XX:MaxMetaspaceSize=256M" />
       <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
@@ -1869,7 +1868,6 @@
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>
@@ -1883,7 +1881,6 @@
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>