From d0af517a14ce45a98e4a86c3a5b0e59a3054d46b Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Wed, 12 Jan 2022 11:19:39 -0800
Subject: [PATCH] ci/traces: Drop the baseline file creation for trace results.

It's always empty for traces.  This reduces more noise in the job logs so
people are more likely to see the link to the HTML.

Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14604>
---
 .gitlab-ci/piglit/piglit-traces.sh | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index ff8d30a06af..68703be4704 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -222,22 +222,7 @@ if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
     fi
 fi
 
-if [ -n "$USE_CASELIST" ]; then
-    # Just filter the expected results based on the tests that were actually
-    # executed, and switch to the version with no summary
-    cat ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" | sed '/^summary:/Q' | rev \
-        | cut -f2- -d: | rev | sed "s/$/:/g" > /tmp/executed.txt
-
-    grep -F -f /tmp/executed.txt "$INSTALL/$PIGLIT_RESULTS.txt" \
-       > ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" || true
-elif [ -f "$INSTALL/$PIGLIT_RESULTS.txt" ]; then
-    cp "$INSTALL/$PIGLIT_RESULTS.txt" \
-       ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline"
-else
-    touch ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline"
-fi
-
-if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE; then
+if [ ! -s $RESULTSFILE ]; then
     exit 0
 fi
 
@@ -249,6 +234,7 @@ find "$RESULTS"/summary -type f -name "*.html" -print0 \
 find "$RESULTS"/summary -type f -name "*.html" -print0 \
         | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE}"'/%g'
 
-quiet diff --color=always -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE
+quiet print_red echo "Failures in traces:"
+cat $RESULTSFILE
 quiet print_red echo "Review the image changes and get the new checksums at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html"
 exit 1