aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2019-07-09 14:28:16 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-05-10 10:35:17 -0400
commitcbd661122e5852d543467090459d33cf8cb4a3c7 (patch)
tree1a45444cc39545b9970ac74a24633ea96d8a1953
parentfa35c34df781cf46bbd15522961f214f03b958bf (diff)
Set LD_LIBRARY_PATH consistently in travis tests
Remove inconsistency between functional and unit test environments and make it possible to substitute bitcoin-qt and bitcoin-node in place of bitcoind in python tests, or to link bitcoind against shared libraries.
-rwxr-xr-xci/test/06_script_b.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index db6502877d..ed720bcd00 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -37,12 +37,12 @@ fi
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
BEGIN_FOLD functional-tests
- DOCKER_EXEC test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast
+ DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast
END_FOLD
fi
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
BEGIN_FOLD fuzz-tests
- DOCKER_EXEC test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} $MAKEJOBS -l DEBUG ${DIR_FUZZ_IN}
+ DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} $MAKEJOBS -l DEBUG ${DIR_FUZZ_IN}
END_FOLD
fi