X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=1dfd64f4ad98b443e83ca2ca00e84d704afede2c;hb=8dfe86431424fa6c43a0ff3ca092989d21a47dbf;hp=fad42e34fdf90b4779d516608a3134d5ff729816;hpb=65fc6cbc3395e2359d2dca03fba0bd14366bc492;p=dcpomatic.git diff --git a/run/tests b/run/tests index fad42e34f..1dfd64f4a 100755 --- a/run/tests +++ b/run/tests @@ -3,7 +3,7 @@ # e.g. --run_tests=foo if [ "$(uname)" == "Linux" ]; then - export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=build/src/lib:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH rm -f build/test/dcpomatic2_openssl # This must be our patched openssl or tests will fail if [ ! -f build/test/dcpomatic2_openssl ]; then @@ -18,10 +18,11 @@ if [ "$(uname)" == "Darwin" ]; then cp fonts/*.ttf $resources cp -r ../libdcp/tags $resources cp -r ../libdcp/xsd $resources + cp ../libdcp/ratings $resources rm -f build/test/openssl ln -s ../../../openssl/apps/openssl build/test/openssl # SIP stops this being passed in from the caller's environment - export DYLD_LIBRARY_PATH=/Users/ci/osx-environment/64/lib + export DYLD_LIBRARY_PATH=/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib # We need to find ffcmp in here export PATH=$PATH:/Users/ci/workspace/bin fi