natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-6.0' into trunk 

* cassandra-6.0:
  in cqlshlib unit reports also remove <testsuites> wrapping elements with attributes
This commit is contained in:
mck 2026-06-10 14:56:07 +02:00
parent 3831d8265d 9e671eea52
commit 344b408f35
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylib/cassandra-cqlsh-tests.sh
View File

@ -97,7 +97,7 @@ pytest --junitxml=${BUILD_DIR}/test/output/cqlshlib.xml
RETURN="$?" RETURN="$?"
# remove <testsuites> wrapping elements. `ant generate-unified-test-report` doesn't like it` # remove <testsuites> wrapping elements. `ant generate-unified-test-report` doesn't like it`
sed -r "s/<[\/]?testsuites>//g" ${BUILD_DIR}/test/output/cqlshlib.xml > /tmp/cqlshlib.xml sed -r "s/<[\/]?testsuites[^>]*>//g" ${BUILD_DIR}/test/output/cqlshlib.xml > /tmp/cqlshlib.xml
cat /tmp/cqlshlib.xml > ${BUILD_DIR}/test/output/cqlshlib.xml cat /tmp/cqlshlib.xml > ${BUILD_DIR}/test/output/cqlshlib.xml
# don't do inline sed for linux+mac compat # don't do inline sed for linux+mac compat