X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=301a5df71e699731ab1aa8772f9a5b8156d18968;hb=a84ee09e386d57aa80bbfaa67be02a6a96081933;hp=037fb43eef2a64056ca5b8e7fed40ee71647648f;hpb=365d2b1468dbc3649426ad5408fee8da2a8db23c;p=dcpomatic.git

diff --git a/run/tests b/run/tests
index 037fb43ee..301a5df71 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,13 @@ 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
 
 if [ "$1" == "--debug" ]; then
@@ -48,6 +51,5 @@ elif [ "$1" == "--helgrind" ]; then
     valgrind --tool="helgrind" build/test/unit-tests $*
 else
     ulimit -c unlimited
-    build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
-#    build/test/unit-tests --catch_system_errors=no $*
+    build/test/unit-tests --catch_system_errors=no $*
 fi