Mesa (staging/21.3): ci/deqp-runner: Drop LD_LIBRARY_PATH=/usr/local for libkms workaround.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 1a1cb690fd4fccdea371cac98f18975e642421a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a1cb690fd4fccdea371cac98f18975e642421a2

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Oct 14 13:58:32 2021 -0700

ci/deqp-runner: Drop LD_LIBRARY_PATH=/usr/local for libkms workaround.

deqp hasn't been linking against that in quite some time.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372>
(cherry picked from commit 61ca900b69521725d318587598c992188b5a2429)

---

 .gitlab-ci/deqp-runner.sh | 4 ----
 .pick_status.json         | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index d31a1271c3e..eda867079b1 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -36,10 +36,6 @@ export LD_LIBRARY_PATH=`pwd`/install/lib/
 export EGL_PLATFORM=surfaceless
 export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json
 
-# the runner was failing to look for libkms in /usr/local/lib for some reason
-# I never figured out.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
 RESULTS=`pwd`/${DEQP_RESULTS_DIR:-results}
 mkdir -p $RESULTS
 
diff --git a/.pick_status.json b/.pick_status.json
index c2494da11b0..57fe840cea7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4072,7 +4072,7 @@
         "description": "ci/deqp-runner: Drop LD_LIBRARY_PATH=/usr/local for libkms workaround.",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },