Merge branch 'cassandra-5.0' into cassandra-6.0

* cassandra-5.0:
  in cqlshlib unit reports also remove <testsuites> wrapping elements with attributes
This commit is contained in:
mck 2026-06-10 14:54:40 +02:00
commit 9e671eea52
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 1 additions and 1 deletions

View File

@ -97,7 +97,7 @@ pytest --junitxml=${BUILD_DIR}/test/output/cqlshlib.xml
RETURN="$?"
# 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
# don't do inline sed for linux+mac compat