ci: Drop double ".txt" suffix on the unexpected results file.
authorEric Anholt <eric@anholt.net>
Tue, 26 May 2020 17:15:19 +0000 (10:15 -0700)
committerMarge Bot <eric+marge@anholt.net>
Thu, 28 May 2020 16:23:59 +0000 (16:23 +0000)
Just a cosmetic fix in reviewing logs.

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

.gitlab-ci/deqp-runner.sh

index 5bcba5849195bd2ed68ac21ac8f70ce8dc7d905e..d2c29071121cc799430bde7fbb9575f7c4c862f7 100755 (executable)
@@ -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