Skip to content

Commit 692c605

Browse files
committed
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.
1 parent 49fa05f commit 692c605

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/test/06_script_b.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ fi
3737

3838
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
3939
BEGIN_FOLD functional-tests
40-
DOCKER_EXEC test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast
40+
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
4141
END_FOLD
4242
fi
4343

4444
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
4545
BEGIN_FOLD fuzz-tests
46-
DOCKER_EXEC test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} -l DEBUG ${DIR_FUZZ_IN}
46+
DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} -l DEBUG ${DIR_FUZZ_IN}
4747
END_FOLD
4848
fi

0 commit comments

Comments
 (0)