Mesa (master): ci: Drop double ".txt" suffix on the unexpected results file.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu May 28 16:43:12 UTC 2020


Module: Mesa
Branch: master
Commit: c343d00edeb9a36a937e38664945ba6554fd4011
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c343d00edeb9a36a937e38664945ba6554fd4011

Author: Eric Anholt <eric at anholt.net>
Date:   Tue May 26 10:15:19 2020 -0700

ci: Drop double ".txt" suffix on the unexpected results file.

Just a cosmetic fix in reviewing logs.

Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5225>

---

 .gitlab-ci/deqp-runner.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 5bcba584919..d2c29071121 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -257,20 +257,20 @@ DEQP_EXITCODE=$?
 if [ $DEQP_EXITCODE -ne 0 ]; then
     # preserve caselist files in case of failures:
     cp /tmp/deqp_runner.*.txt $RESULTS/
-    egrep -v ",Pass|,Skip|,ExpectedFail" $RESULTSFILE > $UNEXPECTED_RESULTSFILE.txt
+    egrep -v ",Pass|,Skip|,ExpectedFail" $RESULTSFILE > $UNEXPECTED_RESULTSFILE
 
     if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
         echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
-        head -n 50 $UNEXPECTED_RESULTSFILE.txt
+        head -n 50 $UNEXPECTED_RESULTSFILE
 
         # Save the logs for up to the first 50 unexpected results:
-        head -n 50 $UNEXPECTED_RESULTSFILE.txt | quiet extract_xml_results /tmp/*.qpa
+        head -n 50 $UNEXPECTED_RESULTSFILE | quiet extract_xml_results /tmp/*.qpa
     else
         echo "Unexpected results found:"
-        cat $UNEXPECTED_RESULTSFILE.txt
+        cat $UNEXPECTED_RESULTSFILE
     fi
 
-    count=`cat $UNEXPECTED_RESULTSFILE.txt | wc -l`
+    count=`cat $UNEXPECTED_RESULTSFILE | wc -l`
 
     # Re-run fails to detect flakes.  But use a small threshold, if
     # something was fundamentally broken, we don't want to re-run



More information about the mesa-commit mailing list