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

ci/vkd3d: group version check lines together

Browse Source 
The comment clearly applies to the check, not the variable, but I'm
guessing stuff got added in between, so let's move the code and its
comment back together.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29749>
This commit is contained in:
Eric Engestrom
2024-06-13 16:01:44 +02:00
committed by Marge Bot
parent bec7b417ca
commit 285ba60166
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,6 @@ RESULTS=$(realpath -s "$PWD"/results)
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=$(cat "$INSTALL/VERSION")
# Set the Vulkan driver to use.
ARCH=$(uname -m)
export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
@@ -38,6 +34,9 @@ quiet() {
set -x
}
# 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 | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION";
then
printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"