OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/vkd3d: move expectation file creation logic out of the test results handling

Browse Source 
The next commit will add checks before we start running the tests.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30413>
This commit is contained in:
Eric Engestrom
2024-07-25 17:09:39 +02:00
committed by Marge Bot
parent cfc8bb3b42
commit 1b8533a7f4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci/vkd3d-runner.sh
View File

@@ -37,6 +37,15 @@ if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_V
exit 1
fi
# Gather the list expected failures
EXPECTATIONFILE="$RESULTS/$GPU_VERSION-vkd3d.txt"
if [ -f "$INSTALL/$GPU_VERSION-vkd3d.txt" ]; then
cp "$INSTALL/$GPU_VERSION-vkd3d.txt" "$EXPECTATIONFILE"
else
printf "%s\n" "$GPU_VERSION-vkd3d.txt not found, assuming a \"no failures\" baseline."
touch "$EXPECTATIONFILE"
fi
printf "%s\n" "Running vkd3d-proton testsuite..."
if ! /vkd3d-proton-tests/x64/bin/d3d12 &> "$RESULTS/vkd3d-proton-log.txt"; then
@@ -53,15 +62,6 @@ if ! /vkd3d-proton-tests/x64/bin/d3d12 &> "$RESULTS/vkd3d-proton-log.txt"; then
exit 1
fi
# Gather the list expected failures
EXPECTATIONFILE="$RESULTS/$GPU_VERSION-vkd3d.txt"
if [ -f "$INSTALL/$GPU_VERSION-vkd3d.txt" ]; then
cp "$INSTALL/$GPU_VERSION-vkd3d.txt" "$EXPECTATIONFILE"
else
printf "%s\n" "$GPU_VERSION-vkd3d.txt not found, assuming a \"no failures\" baseline."
touch "$EXPECTATIONFILE"
fi
# Make sure that the failures found in this run match the current expectation
if ! diff --color=always -u "$EXPECTATIONFILE" "$RESULTSFILE"; then
error "Changes found, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"