cassandra git commit: test-all results incomplete when parsed

[ja...@apache.org]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 3123e88e5 -> 352302f5a


test-all results incomplete when parsed

patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/352302f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/352302f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/352302f5

Branch: refs/heads/trunk
Commit: 352302f5a7a79ee24061b67f980d3e6bf2fcd0d5
Parents: 3123e88
Author: Jason Brown <ja...@gmail.com>
Authored: Tue May 26 15:29:01 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue May 26 15:29:01 2015 -0700

----------------------------------------------------------------------
 build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/352302f5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1e7e444..5ad806f 100644
--- a/build.xml
+++ b/build.xml
@@ -1118,6 +1118,7 @@
     <attribute name="exclude" default="" />
     <attribute name="filelist" default="" />
     <attribute name="poffset" default="0"/>
+    <attribute name="outsubdir" default=""/>
     
     <attribute name="usejacoco" default="no"/>
     <sequential>
@@ -1129,6 +1130,7 @@
       <echo message="running @{suitename} tests"/>
       <mkdir dir="${build.test.dir}/cassandra"/>
       <mkdir dir="${build.test.dir}/output"/>
+      <mkdir dir="${build.test.dir}/output/@{outsubdir}"/>
       <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
         <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/>
         <formatter type="xml" usefile="true"/>
@@ -1154,14 +1156,14 @@
             <include name="**/*.jar" />
           </fileset>
         </classpath>
-        <batchtest todir="${build.test.dir}/output">
+        <batchtest todir="${build.test.dir}/output/@{outsubdir}">
             <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
             <filelist dir="@{inputdir}" files="@{filelist}"/>
         </batchtest>
       </junit>
       <junitreport todir="${build.test.dir}">
         <fileset dir="${build.test.dir}/output">
-          <include name="TEST-*.xml"/>
+          <include name="**/TEST-*.xml"/>
         </fileset>
         <report format="frames" todir="${build.test.dir}/junitreport"/>
       </junitreport>
@@ -1270,7 +1272,7 @@
       <fileset file="${test.conf}/commitlog_compression.yaml"/>
     </concat>
     <echo>Compressed config: ${compressed_yaml}</echo>
-    <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
+    <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}" outsubdir="compression">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>