mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Preserve PATH and LD_LIBRARY_PATH when calling make

Browse Source 
When ./run.sh <test> is invoked, it acts as a wrapper around
`env - TESTS="<test>" make -e check` to preserve the ability to build
files defined only in the `check` target.  Unfortunately, cleaning the
full environment had a side-effect of some tests failing due to missing
binaries and libraries.  We now preserve the two most important
variables - PATH and LD_LIBRARY_PATH.
This commit is contained in:
Mark Andrews
2020-05-29 16:12:50 +10:00
committed by Ondřej Surý
parent 8a93a63356
commit d9b29fcd9d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/run.sh.in
View File

@@ -67,7 +67,7 @@ if ! $do_run; then
if [ "$baseport" -eq 0 ]; then if [ "$baseport" -eq 0 ]; then
log_flags="$log_flags -p 5300" log_flags="$log_flags -p 5300"
fi fi
env - TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check env - PATH="$PATH" ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check
exit $? exit $?
fi fi