This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4e31f03 ninja-fix: fix testlist splits, echo into the fifo
4e31f03 is described below
commit 4e31f03a209aa67cf9e9267e376584df2222c683
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Mar 27 12:41:57 2021 +0100
ninja-fix: fix testlist splits, echo into the fifo
---
build-scripts/cassandra-test.sh | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index bfb3ea9..52ee4a7 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -92,39 +92,32 @@ _main() {
;;
"test")
testlist="$( _list_tests "unit" | _split_tests "${split_chunk}")"
- echo ${testlist}
- ant testclasslist -Dtest.classlistfile=<(${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
+ ant testclasslist -Dtest.classlistfile=<(echo ${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
"test-cdc")
testlist=$( _list_tests "unit" | _split_tests "${split_chunk}")
- echo ${testlist}
- ant testclasslist-cdc -Dtest.classlistfile=<(${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
+ ant testclasslist-cdc -Dtest.classlistfile=<(echo ${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
"test-compression")
testlist=$( _list_tests "unit" | _split_tests "${split_chunk}")
- echo ${testlist}
- ant testclasslist-compression -Dtest.classlistfile=<(${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
+ ant testclasslist-compression -Dtest.classlistfile=<(echo ${testlist})
-Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
"test-burn")
testlist=$( _list_tests "burn" | _split_tests "${split_chunk}")
- echo ${testlist}
- ant testclasslist -Dtest.classlistprefix=burn
-Dtest.timeout=$(_timeout_for "test.burn.timeout")
-Dtest.classlistfile=<(${testlist}) -Dtmp.dir="${TMP_DIR}" || echo "failed
$target"
+ ant testclasslist -Dtest.classlistprefix=burn
-Dtest.timeout=$(_timeout_for "test.burn.timeout") -Dtest.classlistfile=<(echo
${testlist}) -Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
"long-test")
testlist=$( _list_tests "long" | _split_tests "${split_chunk}")
- echo ${testlist}
- ant testclasslist -Dtest.classlistprefix=long
-Dtest.timeout=$(_timeout_for "test.long.timeout")
-Dtest.classlistfile=<(${testlist}) -Dtmp.dir="${TMP_DIR}" || echo "failed
$target"
+ ant testclasslist -Dtest.classlistprefix=long
-Dtest.timeout=$(_timeout_for "test.long.timeout") -Dtest.classlistfile=<(echo
${testlist}) -Dtmp.dir="${TMP_DIR}" || echo "failed $target"
;;
"jvm-dtest")
testlist=$( _list_tests "distributed" | grep -v "upgrade" | _split_tests
"${split_chunk}")
- echo ${testlist}
- ant testclasslist -Dtest.classlistprefix=distributed
-Dtest.timeout=$(_timeout_for "test.distributed.timeout")
-Dtest.classlistfile=<(${testlist}) -Dtmp.dir="${TMP_DIR}" -Dtest.runners=1 ||
echo "failed $target"
+ ant testclasslist -Dtest.classlistprefix=distributed
-Dtest.timeout=$(_timeout_for "test.distributed.timeout")
-Dtest.classlistfile=<(echo ${testlist}) -Dtmp.dir="${TMP_DIR}"
-Dtest.runners=1 || echo "failed $target"
;;
"jvm-dtest-upgrade")
_build_all_dtest_jars
testlist=$( _list_tests "distributed" | grep "upgrade" | _split_tests
"${split_chunk}")
- echo ${testlist}
- ant testclasslist -Dtest.classlistprefix=distributed
-Dtest.timeout=$(_timeout_for "test.distributed.timeout")
-Dtest.classlistfile=<(${testlist}) -Dtmp.dir="${TMP_DIR}" -Dtest.runners=1 ||
echo "failed $target"
+ ant testclasslist -Dtest.classlistprefix=distributed
-Dtest.timeout=$(_timeout_for "test.distributed.timeout")
-Dtest.classlistfile=<(echo ${testlist}) -Dtmp.dir="${TMP_DIR}"
-Dtest.runners=1 || echo "failed $target"
;;
*)
echo "unregconised \"$target\""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
