X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Ftests;h=d34ae5b1169c16f27aca75f5c37a4d59b5e8db67;hp=e6cdf4ba84656f4b739b0c54bd3e4d5ff16a6652;hb=e9c91414ade10f93bb23b33d48d30bf80045d7b1;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4

diff --git a/run/tests b/run/tests
index e6cdf4ba8..d34ae5b11 100755
--- a/run/tests
+++ b/run/tests
@@ -1,11 +1,67 @@
 #!/bin/bash
+#
+# e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="a462680c7c6df8a84f9ee0bb7b4fb90055b96ca8"
+
+if [ "$(uname)" == "Linux" ]; then 
+  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 
+    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
+
+pushd ../dcpomatic-test-private
+current=$(git rev-parse HEAD)
+if [ "$current" != "$PRIVATE_GIT" ]; then
+	echo "Unexpected dcpomatic-test-private version"
+	exit 1
+fi
+./check_sums || (echo "dcpomatic-test-private checksums are incorrect"; exit 1)
+popd
 
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
-    gdb --args build/test/unit-tests --catch_system_errors=no
+    shift;
+    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" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
 elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" --leak-check=full build/test/unit-tests
+    shift;
+#    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
-    build/test/unit-tests --catch_system_errors=no
+    ulimit -c unlimited
+    build/test/unit-tests --catch_system_errors=no $*
 fi
-