diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh index 2b9c08fb034..10df7169f73 100755 --- a/.gitlab-ci/vkd3d-runner.sh +++ b/.gitlab-ci/vkd3d-runner.sh @@ -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"