From eddbadb0b158ccab3f0321c0bacba31b249b1055 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 13 Jun 2024 16:41:19 +0200 Subject: [PATCH] ci/vkd3d: put `then` on the same line as the `if` to match the rest of the code style Part-of: --- .gitlab-ci/vkd3d-proton/run.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh index 8eb94d3c746..80aa0027ba0 100755 --- a/.gitlab-ci/vkd3d-proton/run.sh +++ b/.gitlab-ci/vkd3d-proton/run.sh @@ -37,8 +37,7 @@ quiet() { # Sanity check to ensure that our environment is sufficient to make our tests # run against the Mesa built by CI, rather than any installed distro version. MESA_VERSION=$(cat "$INSTALL/VERSION") -if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION"; -then +if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION"; then printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION" exit 1 fi @@ -51,8 +50,7 @@ fi 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 # Check if the executable finished (ie. no segfault). if ! grep "tests executed" "$RESULTS/vkd3d-proton-log.txt" > /dev/null; then error "Failed, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"