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%