From: Eric Anholt <eric@anholt.net>
Date: Fri, 14 Feb 2020 00:44:04 +0000 (-0800)
Subject: ci: Make LAVA job fails emit the full list of unexpected test results.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=994e258122663fd4d869b583cb9f4e0e2f36a0aa;p=mesa.git

ci: Make LAVA job fails emit the full list of unexpected test results.

When bringing up a new board or starting a new GLES version, we have a lot
of unexpected fails to document, so we need the full list in the log (not
just deqp-runner.sh's head -n 50) so we can populate the xfail list.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3883>
---

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 5e7543fb083..4e2b911624c 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -193,17 +193,21 @@ quiet generate_junit $RESULTS/cts-runner-results.txt > $RESULTS/results.xml
 if [ $DEQP_EXITCODE -ne 0 ]; then
     # preserve caselist files in case of failures:
     cp /tmp/deqp_runner.*.txt $RESULTS/
-    echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
     cat $RESULTS/cts-runner-results.txt | \
         grep -v ",Pass" | \
         grep -v ",Skip" | \
         grep -v ",ExpectedFail" > \
         $RESULTS/cts-runner-unexpected-results.txt
-    head -n 50 $RESULTS/cts-runner-unexpected-results.txt
 
     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 $RESULTS/cts-runner-unexpected-results.txt
+
         # Save the logs for up to the first 50 unexpected results:
         head -n 50 $RESULTS/cts-runner-unexpected-results.txt | quiet extract_xml_results /tmp/*.qpa
+    else
+        echo "Unexpected results found:"
+        cat $RESULTS/cts-runner-unexpected-results.txt
     fi
 
     count=`cat $RESULTS/cts-runner-unexpected-results.txt | wc -l`