From: Carl Hetherington Date: Tue, 29 Sep 2020 21:17:24 +0000 (+0200) Subject: Try a little harder to make sure we use the patched openssl for X-Git-Tag: v2.15.104~66 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=98fa5c8c95587e1b016a1432371d58288c94b145 Try a little harder to make sure we use the patched openssl for unit tests. --- diff --git a/run/tests b/run/tests index 97eef411f..8b54d2b45 100755 --- a/run/tests +++ b/run/tests @@ -2,7 +2,13 @@ # # e.g. --run_tests=foo -export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH +if [ "$(uname)" == "Linux" ]; then + export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH + rm -f build/test/openssl + # This must be our patched openssl or tests will fail + ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl +fi + if [ "$1" == "--debug" ]; then shift; gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*