From 44d28dca26d9e9503b914dd4e4d99c9f863a9ae3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 11 Jun 2020 13:19:11 -0700 Subject: [PATCH] ci: Fix weird filesystem globs appearing in failed test .qpa files. When you get a filure and go looking in the results, you'll find weird stuff like this in the XML: Reference images fill undefined pixels with 3x3 grid pattern. Attachment 0 (p' = p bin boot builds dEQP-VK.renderpass.suballocation.attachment_allocation.grow_shrink.89.qpa deqp dev etc home init install lib media mnt proc results root run sbin set-job-env-vars.sh sys tmp usr var (1, 1, 1, 1) + (-1, -1, -1, 1)) because we were not quoting the line and 'p *' was getting expanded. Reviewed-by: Rob Clark Part-of: --- .gitlab-ci/deqp-runner.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index b9f14fe25b4..6034b71a2c2 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -149,10 +149,10 @@ extract_xml_result() { if [ "$line" = "$start" ]; then dst="$testcase.qpa" echo "#beginSession" > $dst - echo $line >> $dst + echo "$line" >> $dst while IFS= read -r line; do if [ "$line" = "#endTestCaseResult" ]; then - echo $line >> $dst + echo "$line" >> $dst echo "#endSession" >> $dst /deqp/executor/testlog-to-xml $dst "$RESULTS/$testcase$DEQP_RUN_SUFFIX.xml" # copy the stylesheets here so they only end up in artifacts @@ -161,7 +161,7 @@ extract_xml_result() { cp /deqp/testlog.xsl "$RESULTS/" return 0 fi - echo $line >> $dst + echo "$line" >> $dst done return 1 fi -- 2.30.2