summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2020-05-26 11:18:33 -0700
committerEric Engestrom <eric@engestrom.ch>2020-07-08 19:31:15 +0200
commit4ff44bd14bffaa7364f1bafcf7f0615d438aafd3 (patch)
treeba91fd29fb2329ac927ddda84bc8ecaba0b05c34
parent1446dac1659b2e9dfdb2a81e5fd0bf01cc620d45 (diff)
ci: Auto-detect the architecture for VK ICD filenames.
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> (cherry picked from commit 6766d51c15fc8143466b53aa7384d0c06218f12d) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5548>
-rwxr-xr-x.gitlab-ci/deqp-runner.sh2
1 files changed, 1 insertions, 1 deletions
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.