commit d598fc3648ecf9f6e5a3cc024ba83b1537bee753
author Brandon Maier <brandon.maier@gmail.com> Sun Jun 23 21:17:48 2024 -0500
committer David Gibson <david@gibson.dropbear.id.au> Wed Jun 26 11:27:02 2024 +1000
tree 1a039f95aba78668bcd1b55277ede540fd4f1690
parent b98239da2f18d2bfe0934ac705ef8d8b92277f74

tests/run_tests.sh: fix Meson library path being dropped

Meson automatically passes in LD_LIBRARY_PATH pointing at the correct
build directory for libfdt.so. So preserve LD_LIBRARY_PATH if it's
already set.

Signed-off-by: Brandon Maier <brandon.maier@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index b14c864..c5d6a88 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -55,7 +55,11 @@
 if [ -z "$TEST_LIBDIR" ]; then
     TEST_LIBDIR=../libfdt
 fi
-export LD_LIBRARY_PATH="$TEST_LIBDIR"
+if [ -n "$LD_LIBRARY_PATH" ]; then
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TEST_LIBDIR"
+else
+    export LD_LIBRARY_PATH="$TEST_LIBDIR"
+fi
 
 export QUIET_TEST=1
 STOP_ON_FAIL=0