This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 92069ec093 testsome target doesn't work with wildcards
92069ec093 is described below
commit 92069ec0932774357f5a7babaf3ec28ca1255286
Author: Bereng <[email protected]>
AuthorDate: Fri Jun 3 07:29:09 2022 +0200
testsome target doesn't work with wildcards
Patch by Bernardo Botella Corbi; reviewed by Brandon Williams and Berenguer
Blasi for CASSANDRA-17083
---
build.xml | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index d0466578ac..15da1e7df1 100644
--- a/build.xml
+++ b/build.xml
@@ -1656,9 +1656,27 @@
ant testsome
-Dtest.name=org.apache.cassandra.service.StorageServiceServerTest
-Dtest.methods=testRegularMode,testGetAllRangesEmpty
-->
<target name="testsome" depends="build-test" description="Execute specific
unit tests" >
+ <condition property="withoutMethods">
+ <and>
+ <equals arg1="${test.methods}" arg2=""/>
+ <not>
+ <contains string="${test.name}" substring="*"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="withMethods">
+ <and>
+ <not>
+ <equals arg1="${test.methods}" arg2=""/>
+ </not>
+ <not>
+ <contains string="${test.name}" substring="*"/>
+ </not>
+ </and>
+ </condition>
<testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
- <test unless:blank="${test.methods}" name="${test.name}"
methods="${test.methods}"
outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
- <test if:blank="${test.methods}" name="${test.name}"
outfile="build/test/output/TEST-${test.name}"/>
+ <test if="withMethods" name="${test.name}" methods="${test.methods}"
outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
+ <test if="withoutMethods" name="${test.name}"
outfile="build/test/output/TEST-${test.name}"/>
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg
value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
