cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/3] git commit: unify test timeouts, exclude pig
Date Fri, 31 Jan 2014 18:24:16 GMT
unify test timeouts, exclude pig


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

Branch: refs/heads/cassandra-2.0
Commit: 9a024b8018fb88dc7212a88878933ce077595dbd
Parents: 5f6c5ce
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jan 31 12:20:18 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Jan 31 12:20:18 2014 -0600

----------------------------------------------------------------------
 build.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a024b80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2a6c524..667dbe2 100644
--- a/build.xml
+++ b/build.xml
@@ -1110,46 +1110,52 @@
   </target>
 
   <target name="test" depends="build-test" description="Execute unit tests">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
+    <fileset dir="${test.unit.src}">
+        <exclude name="**/pig/*.java" />
+    </fileset>
   </target>
     
   <target name="test-compression" depends="build-test" description="Execute unit tests
with sstable compression enabled">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+      <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.test.compression=true"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
+    <fileset dir="${test.unit.src}">
+        <exclude name="**/pig/*.java" />
+    </fileset>
   </target>
 
   <target name="msg-ser-gen-test" depends="build-test" description="Generates message
serializations">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.test-serialization-writes=True"/>
     </testmacro>
   </target>
   
   <target name="msg-ser-test" depends="build-test" description="Tests message serializations">
-    <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000"
+      <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}"
                filter="**/SerializationsTest.java"/>
   </target>
   
   <target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=0.7"/>
     </testmacro>
   </target>
 
   <target name="msg-ser-test-10" depends="build-test" description="Tests message serializations
on 1.0 messages">
     <testmacro suitename="unit" inputdir="${test.unit.src}" 
-               timeout="60000" filter="**/SerializationsTest.java">
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=1.0"/>
     </testmacro>
   </target>


Mime
View raw message