aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2019-07-09 14:28:16 -0400
committerRussell Yanofsky <russ@yanofsky.org>2020-04-05 21:48:21 -0400
commit787f40668dc15980c3d6de028d7950c08175d84a (patch)
tree78aee6b10fc440a283482d171c3e3fcffd5115af /ci
parentd6306466626635e6fee44385e6a688c8dc118eb5 (diff)
downloadbitcoin-787f40668dc15980c3d6de028d7950c08175d84a.tar.xz
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.
Diffstat (limited to 'ci')
-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 3b32513353..9b2f0d91ec 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -30,12 +30,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} -l DEBUG ${DIR_FUZZ_IN}
+ DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} -l DEBUG ${DIR_FUZZ_IN}
END_FOLD
fi