From 3127b52ef709c4157686af24bfdbf659b01bbbcb Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 14 May 2024 19:28:56 +0200
Subject: [PATCH] ci/vkd3d: fix version sanity check

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29201>
---
 .gitlab-ci/vkd3d-proton/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh
index cba3299108a..32ecf994608 100755
--- a/.gitlab-ci/vkd3d-proton/run.sh
+++ b/.gitlab-ci/vkd3d-proton/run.sh
@@ -20,7 +20,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
 
 # 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=$(sed 's/\./\\./g' "$INSTALL/VERSION")
+MESA_VERSION=$(cat "$INSTALL/VERSION")
 
 # Set the Vulkan driver to use.
 ARCH=$(uname -m)
@@ -39,7 +39,7 @@ quiet() {
 }
 
 set +e
-if ! vulkaninfo | tee /tmp/version.txt | grep "\"Mesa $MESA_VERSION\(\s\|$\)\"";
+if ! vulkaninfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION";
 then
     printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
 fi