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

ci/vkd3d: rename vkd3d test log file to end in .txt

Browse Source 
That way GitLab allows reading it in the browser instead of forcing a download.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29749>
This commit is contained in:
Eric Engestrom
2024-06-15 16:17:12 +02:00
committed by Marge Bot
parent 6f6a13f5fc
commit 662b0ad3cd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,19 +51,19 @@ fi
quiet printf "%s\n" "Running vkd3d-proton testsuite..." quiet printf "%s\n" "Running vkd3d-proton testsuite..."
if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton.log"; if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton-log.txt";
then then
# Check if the executable finished (ie. no segfault). # Check if the executable finished (ie. no segfault).
if ! grep "tests executed" "$RESULTS/vkd3d-proton.log" > /dev/null; then if ! grep "tests executed" "$RESULTS/vkd3d-proton-log.txt" > /dev/null; then
error "Failed, see vkd3d-proton.log!" error "Failed, see vkd3d-proton-log.txt!"
exit 1 exit 1
fi fi
# Collect all the failures # Collect all the failures
RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt" RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt"
mkdir -p .gitlab-ci/vkd3d-proton mkdir -p .gitlab-ci/vkd3d-proton
if ! grep "Test failed" "$RESULTS"/vkd3d-proton.log > "$RESULTSFILE"; then if ! grep "Test failed" "$RESULTS"/vkd3d-proton-log.txt > "$RESULTSFILE"; then
error "Failed to get the list of failing tests, see vkd3d-proton.log!" error "Failed to get the list of failing tests, see vkd3d-proton-log.txt!"
exit 1 exit 1
fi fi
@@ -78,7 +78,7 @@ then
# Make sure that the failures found in this run match the current expectation # Make sure that the failures found in this run match the current expectation
if ! diff --color=always -u ".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 "Changes found, see vkd3d-proton.log!" error "Changes found, see vkd3d-proton-log.txt!"
exit 1 exit 1
fi fi
fi fi