From d598fc3648ecf9f6e5a3cc024ba83b1537bee753 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Sun, 23 Jun 2024 21:17:48 -0500 Subject: [PATCH] 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 Signed-off-by: David Gibson --- tests/run_tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@ fi 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