Mesa (master): ci: Auto-detect the architecture for VK ICD filenames.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu May 28 16:43:12 UTC 2020


Module: Mesa
Branch: master
Commit: 6766d51c15fc8143466b53aa7384d0c06218f12d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6766d51c15fc8143466b53aa7384d0c06218f12d

Author: Eric Anholt <eric at anholt.net>
Date:   Tue May 26 11:18:33 2020 -0700

ci: Auto-detect the architecture for VK ICD filenames.

Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5225>

---

 .gitlab-ci/deqp-runner.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 1b18bb405d8..f40b72a45ed 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -29,7 +29,7 @@ INSTALL=`pwd`/install
 # Set up the driver environment.
 export LD_LIBRARY_PATH=`pwd`/install/lib/
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.x86_64.json
+export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.`uname -m`.json
 
 # the runner was failing to look for libkms in /usr/local/lib for some reason
 # I never figured out.



More information about the mesa-commit mailing list