X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Ftests;h=ab0fcf2f51ba43432e796e3c8d12ae1674430010;hp=d9815a449ae619ba6a55678584599908b2202ac3;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=89aa9d4ba69e471949f791cdafe4ae20cea554d2

diff --git a/run/tests b/run/tests
index d9815a449..ab0fcf2f5 100755
--- a/run/tests
+++ b/run/tests
@@ -2,24 +2,55 @@
 #
 # e.g. --run_tests=foo
 
-export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DCPOMATIC_LINUX_SHARE_PREFIX=`pwd`
+if [ "$(uname)" == "Linux" ]; then 
+  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
+  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
+  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/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
     shift;
-    gdb --args build/test/unit-tests --catch_system_errors=no $*
+    gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
 elif [ "$1" == "--backtrace" ]; then
     shift;
-    gdb -batch -ex "run" -ex "thread apply all bt" --args build/test/unit-tests --catch_system_errors=no $*
+    gdb -batch -ex "run" -ex "thread apply all bt" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
 elif [ "$1" == "--valgrind" ]; then
     shift;
-    valgrind --tool="memcheck" --leak-check=full build/test/unit-tests $*
+#    valgrind --tool="memcheck" --vgdb=yes --vgdb-error=0 build/test/unit-tests $*
+    valgrind --tool="memcheck" --suppressions=suppressions build/test/unit-tests $*
 elif [ "$1" == "--callgrind" ]; then
     shift;
     valgrind --tool="callgrind" build/test/unit-tests $*
 elif [ "$1" == "--quiet" ]; then
     shift;
     build/test/unit-tests --catch_system_errors=no $*
+elif [ "$1" == "--drd" ]; then
+    shift;
+    valgrind --tool="drd" build/test/unit-tests $*
+elif [ "$1" == "--helgrind" ]; then
+    shift;
+    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 $*
 fi