ci: Auto-detect the architecture for VK ICD filenames.
authorEric Anholt <eric@anholt.net>
Tue, 26 May 2020 18:18:33 +0000 (11:18 -0700)
committerMarge Bot <eric+marge@anholt.net>
Thu, 28 May 2020 16:23:59 +0000 (16:23 +0000)
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5225>

.gitlab-ci/deqp-runner.sh

index 1b18bb405d8cc6188c1ebe546b41d3bb09a2d6fd..f40b72a45ed60a2415b1d388b4dbc218c84d3d03 100755 (executable)
@@ -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.