Updated Branches: refs/heads/cassandra-1.2 9a024b801 -> 3f9875c7f refs/heads/cassandra-2.0 23e86ee15 -> 8ecc6f111
exclude pig from test target Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f9875c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f9875c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f9875c7 Branch: refs/heads/cassandra-1.2 Commit: 3f9875c7f5f1456dd4671a757ce7e27c1dcad9b5 Parents: 9a024b8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 31 14:08:07 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 31 14:08:07 2014 -0600 ---------------------------------------------------------------------- build.xml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f9875c7/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 667dbe2..150e2fe 100644 --- a/build.xml +++ b/build.xml @@ -1047,6 +1047,7 @@ <attribute name="forkmode" default="perTest"/> <element name="optjvmargs" implicit="true" optional="true" /> <attribute name="filter" default="**/${test.name}.java"/> + <attribute name="exclude" default="" /> <sequential> <echo message="running @{suitename} tests"/> <mkdir dir="${build.test.dir}/cassandra"/> @@ -1072,7 +1073,7 @@ </fileset> </classpath> <batchtest todir="${build.test.dir}/output"> - <fileset dir="@{inputdir}" includes="@{filter}" /> + <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/> </batchtest> </junit> <fail message="Some @{suitename} test(s) failed."> @@ -1109,29 +1110,23 @@ </junit> </target> - <target name="test" depends="build-test" description="Execute unit tests"> - <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}"> + <target name="test" depends="build-test" description="Execute unit tests" > + <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" 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="${test.timeout}"> + <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" 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">