X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=4ad5d846f829e845f4539af229b0f71d3ce95ee4;hb=6fb258f79548b588031c4cc6d0ca1774ca35b752;hp=8b54d2b457757a174818b6cc63e112bd0cd287b5;hpb=98fa5c8c95587e1b016a1432371d58288c94b145;p=dcpomatic.git diff --git a/run/tests b/run/tests index 8b54d2b45..4ad5d846f 100755 --- a/run/tests +++ b/run/tests @@ -3,10 +3,27 @@ # e.g. --run_tests=foo if [ "$(uname)" == "Linux" ]; then - export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH - rm -f build/test/openssl + export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH + rm -f build/test/dcpomatic2_openssl # This must be our patched openssl or tests will fail - ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl + if [ ! -f build/test/dcpomatic2_openssl ]; then + ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl + fi +fi + +if [ "$(uname)" == "Darwin" ]; then + resources=build/Resources + rm -rf $resources + mkdir -p $resources + cp fonts/*.ttf $resources + cp -r ../libdcp/tags $resources + cp -r ../libdcp/xsd $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/x86_64/lib + # We need to find ffcmp in here + export PATH=$PATH:/Users/ci/workspace/bin fi if [ "$1" == "--debug" ]; then