From b6633e5880bff3c97e07570113037905f86ff31a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 14 Jun 2024 15:17:28 +0200 Subject: [PATCH] ci/vkd3d: drop the "clear results folder without deleting the folder" logic 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: --- .gitlab-ci/vkd3d-proton/run.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh index 80aa0027ba0..75da12fb46a 100755 --- a/.gitlab-ci/vkd3d-proton/run.sh +++ b/.gitlab-ci/vkd3d-proton/run.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# shellcheck disable=SC2035 # FIXME glob set -ex @@ -11,6 +10,9 @@ INSTALL=$(realpath -s "$PWD"/install) RESULTS=$(realpath -s "$PWD"/results) +# Make sure the results folder exists +mkdir -p "$RESULTS" + # Set up the driver environment. # Modifiying here directly LD_LIBRARY_PATH may cause problems when # 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 fi -if [ -d "$RESULTS" ]; then - cd "$RESULTS" && rm -rf ..?* .[!.]* * && cd - -else - mkdir "$RESULTS" -fi - quiet printf "%s\n" "Running vkd3d-proton testsuite..." if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton-log.txt"; then