cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [1/4] cassandra git commit: test-all results incomplete when parsed
Date Wed, 27 May 2015 15:57:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 162489aed -> 860141229
  refs/heads/trunk 352302f5a -> 3c98472d5


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/162489ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162489ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162489ae

Branch: refs/heads/trunk
Commit: 162489aed57866d5f8185d78a05588e1e81c549e
Parents: 91187b5
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Tue May 26 15:29:01 2015 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed May 27 08:39:32 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/162489ae/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 69f6a61..cbedf20 100644
--- a/build.xml
+++ b/build.xml
@@ -1116,6 +1116,7 @@
     <attribute name="exclude" default="" />
     <attribute name="filelist" default="" />
     <attribute name="poffset" default="0"/>
+    <attribute name="outsubdir" default=""/>
     
     <attribute name="usejacoco" default="no"/>
     <sequential>
@@ -1127,6 +1128,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"/>
@@ -1152,14 +1154,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>
@@ -1268,7 +1270,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"/>


Mime
View raw message