fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci/vkd3d: fail shell pipeline when part of it fails

Browse source 
We use pipes in several places and don't want to ignore their failures.

A couple of exceptions are allowed with explicit `|| true`.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34639>
This commit is contained in:
Eric Engestrom 2025-04-18 14:22:38 +02:00 • committed by Marge Bot
parent 104f21c27b
commit a0407a6ecf
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci/vkd3d-runner.sh
View file

@ -3,7 +3,7 @@
. "${SCRIPTS_DIR}/setup-test-env.sh"
set -eu
set -eu -o pipefail
comma_separated() {
local IFS=,
@ -51,7 +51,10 @@ fi
# Gather the list expected failures
EXPECTATIONFILE="$RESULTS_DIR/$GPU_VERSION-vkd3d-fails.txt"
if [ -f "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" ]; then
grep -vE '^(#|$)' "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" | sort > "$EXPECTATIONFILE"
# Ignore the grep "failure" if the file exists but contains only comments
# or empty lines; the expectation file used will be empty in this case,
# which is not a problem.
grep -vE '^(#|$)' "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" | sort > "$EXPECTATIONFILE" || true
else
printf "%s\n" "$GPU_VERSION-vkd3d-fails.txt not found, assuming a \"no failures\" baseline."
touch "$EXPECTATIONFILE"
@ -90,7 +93,9 @@ printf "%s\n" "Running vkd3d-proton testsuite..."
LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
TEST_LOGS="/test-logs"
(cd /vkd3d-proton-tests && tests/test-runner.sh ./d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE")
pushd /vkd3d-proton-tests
tests/test-runner.sh ./d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
popd
printf '\n\n'
@ -108,8 +113,8 @@ if [ ${#flakes_seen[@]} -gt 0 ]; then
printf >&2 ' %s\n' "${flakes_seen[@]}"
fi
# Collect all the failures
fails_lines=$(grep -oE "^FAILED .+$" "$LOGFILE" | cut -d' ' -f2 | sort)
# Collect all the failures; ignore grep "failure" if there are none
fails_lines=$(grep -oE "^FAILED .+$" "$LOGFILE" | cut -d' ' -f2 | sort) || true
if [ -n "$fails_lines" ]; then
mapfile -t fails < <(echo "$fails_lines")
else