Skip to content

Commit 5e5ae5c

Browse files
authored
Merge pull request ceph#55297 from VallariAg/fix-gtest-xml-path
qa/workunits/rados/test.sh: fix GTEST_OUTPUT path
2 parents 0563b94 + 260a76f commit 5e5ae5c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

qa/tasks/workunit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
427427
logger=log.getChild(role),
428428
args=args + optional_args,
429429
label="workunit test {workunit}".format(workunit=workunit),
430-
xml_path_regex=f'{testdir}/archive/gtest_xml_report-*.xml',
430+
xml_path_regex=f'{testdir}/archive/unit_test_xml_report/*.xml',
431431
output_yaml=os.path.join(ctx.archive, 'unit_test_summary.yaml'),
432432
)
433433
else:

qa/workunits/rados/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ function cleanup() {
1616
}
1717
trap cleanup EXIT ERR HUP INT QUIT
1818

19-
GTEST_OUTPUT="xml:/home/ubuntu/cephtest/archive/gtest_xml_report"
19+
GTEST_OUTPUT_DIR=${TESTDIR:-$(mktemp -d)}/archive/unit_test_xml_report
20+
mkdir -p $GTEST_OUTPUT_DIR
2021

2122
declare -A pids
2223

@@ -43,7 +44,7 @@ do
4344
if [ $parallel -eq 1 ]; then
4445
r=`printf '%25s' $f`
4546
ff=`echo $f | awk '{print $1}'`
46-
bash -o pipefail -exc "ceph_test_rados_$f --gtest_output=$GTEST_OUTPUT-$f.xml $color 2>&1 | tee ceph_test_rados_$ff.log | sed \"s/^/$r: /\"" &
47+
bash -o pipefail -exc "ceph_test_rados_$f --gtest_output=xml:$GTEST_OUTPUT_DIR/$f.xml $color 2>&1 | tee ceph_test_rados_$ff.log | sed \"s/^/$r: /\"" &
4748
pid=$!
4849
echo "test $f on pid $pid"
4950
pids[$f]=$pid

0 commit comments

Comments
 (0)