Mesa (master): gitlab-ci: fix ldd check for Vulkan drivers

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Nov 21 09:06:20 UTC 2019


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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Nov 14 14:00:46 2019 +0100

gitlab-ci: fix ldd check for Vulkan drivers

The 'dri' directory isn't created when building Vulkan drivers.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

---

 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3888d55baa..5860026296c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -476,7 +476,7 @@ scons-old-llvm:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
     - tar -xf artifacts/install.tar
-    - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so
+    - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"




More information about the mesa-commit mailing list