AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/vkd3d: deduplicate the diff between the expectation and the results

Browse Source 
We're seeing weird errors where the results file has disappeared, so
let's start by combining the "is this right?" and "what's wrong?" logic
into one.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29749>
This commit is contained in:
Eric Engestrom
2024-06-13 16:08:47 +02:00
committed by Marge Bot
parent e602a7a392
commit b1f82ce646
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/vkd3d-proton/run.sh
View File

@@ -77,9 +77,8 @@ then
fi
# Make sure that the failures found in this run match the current expectation
if ! diff -q ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
if ! diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
error printf "%s\n" "Changes found, see vkd3d-proton.log!"
quiet diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"
exit 1
fi
fi