export WINEPREFIX="/vkd3d-proton-wine64"
export WINEESYNC=1
+print_red() {
+ RED='\033[0;31m'
+ NC='\033[0m' # No Color
+ printf "${RED}"
+ "$@"
+ printf "${NC}"
+}
+
+# wrapper to supress +x to avoid spamming the log
+quiet() {
+ set +x
+ "$@"
+ set -x
+}
+
SANITY_MESA_VERSION_CMD="vulkaninfo | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD"
VKD3D_PROTON_TESTSUITE_CMD="wine /vkd3d-proton-tests/x64/bin/d3d12.exe >$RESULTS/vkd3d-proton.log 2>&1"
-printf "Running vkd3d-proton testsuite...\n"
+quiet printf "%s\n" "Running vkd3d-proton testsuite..."
RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $VKD3D_PROTON_TESTSUITE_CMD"
set +e
VKD3D_PROTON_RESULTS="vkd3d-proton-${VKD3D_PROTON_RESULTS:-results}"
RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt"
+mkdir -p .gitlab-ci/vkd3d-proton
grep "Test failed" "$RESULTS"/vkd3d-proton.log > "$RESULTSFILE"
if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS.txt" ]; then
touch ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
fi
-if diff -q ".gitlab-ci/vkd3d-proton/$PIGLIT_RESULTS.txt.baseline" "$RESULTSFILE"; then
+if diff -q ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
exit 0
fi
-printf "Regressions found, see vkd3d-proton.log!\n"
+quiet print_red 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
-d3d12:23926: Test failed: PSInvocations: Got 256, expected >= 1024.
-d3d12:30894: Test failed: Got 0xffffffff, expected 0xff9bc864 at (0, 0, 0).
-d3d12:37735: Test failed: Got 0xff00ff00, expected 0xffffffff at (0, 0, 0).
-d3d12:43170:test 7: Test failed: Failed to create reserved resource, hr 0x80070057.
-d3d12:43170:test 8: Test failed: Failed to create reserved resource, hr 0x80070057.
-d3d12:43973:Test 3: Test failed: Got color 0x00000000, expected 0xccb3804d.
-d3d12:46546:Test 12: Test failed: Inconsistent GPU timestamps.
-d3d12:46547:Test 12: Test failed: Inconsistent CPU timestamps.
-d3d12:46633:Test 12: Test failed: Failed to open heap from file mapping: hr #8007000e.
-d3d12:50060:Test 12: Test failed: Got hr 0x8007000e, expected 0.
+d3d12:23926: Test failed: PSInvocations: Got 256, expected >= 1024.\r
+d3d12:30894: Test failed: Got 0xffffffff, expected 0xff9bc864 at (0, 0, 0).\r
+d3d12:37735: Test failed: Got 0xff00ff00, expected 0xffffffff at (0, 0, 0).\r
+d3d12:43170:test 7: Test failed: Failed to create reserved resource, hr 0x80070057.\r
+d3d12:43170:test 8: Test failed: Failed to create reserved resource, hr 0x80070057.\r
+d3d12:43973:Test 3: Test failed: Got color 0x00000000, expected 0xccb3804d.\r
+d3d12:46546:Test 12: Test failed: Inconsistent GPU timestamps.\r
+d3d12:46547:Test 12: Test failed: Inconsistent CPU timestamps.\r
+d3d12:46633:Test 12: Test failed: Failed to open heap from file mapping: hr #8007000e.\r
+d3d12:50060:Test 12: Test failed: Got hr 0x8007000e, expected 0.\r