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

ci/vkd3d: drop the "clear results folder without deleting the folder" logic

Browse Source 
I might be wrong about this one, but I don't see what it could be for.

We don't want to delete too much either, in case this script gets called
in the same job as another test suite.

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

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

@@ -1,5 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2035 # FIXME glob
set -ex set -ex
@@ -11,6 +10,9 @@ INSTALL=$(realpath -s "$PWD"/install)
RESULTS=$(realpath -s "$PWD"/results) RESULTS=$(realpath -s "$PWD"/results)
# Make sure the results folder exists
mkdir -p "$RESULTS"
# Set up the driver environment. # Set up the driver environment.
# Modifiying here directly LD_LIBRARY_PATH may cause problems when # Modifiying here directly LD_LIBRARY_PATH may cause problems when
# using a command wrapper. Hence, we will just set it when running the # using a command wrapper. Hence, we will just set it when running the
@@ -42,12 +44,6 @@ if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_V
exit 1 exit 1
fi fi
if [ -d "$RESULTS" ]; then
cd "$RESULTS" && rm -rf ..?* .[!.]* * && cd -
else
mkdir "$RESULTS"
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.txt"; then if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton-log.txt"; then