Skip to content

Commit

Permalink
tests/run_tests.sh: fix Meson library path being dropped
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David Gibson <[email protected]>
  • Loading branch information
blmaier authored and dgibson committed Jun 26, 2024
1 parent b98239d commit d598fc3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d598fc3

Please sign in to comment.