X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=f2b2ae6b6a133a96458064d172d245cd9929821c;hb=a66c4f957d50e93e01912810876fbdd883ac5d6a;hp=73123fc1ad52415525ac8c24202925ce6a2f5b84;hpb=9a663d3f2e467f65dd7a364ed8631107fed5182d;p=dcpomatic.git

diff --git a/run/tests b/run/tests
index 73123fc1a..f2b2ae6b6 100755
--- a/run/tests
+++ b/run/tests
@@ -1,27 +1,79 @@
 #!/bin/bash
 #
 # e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="49276da301a937fbf09bc9e7b5a537cdee72bc46"
+
+if [ "$1" == "--check" ]; then
+	shift 1
+	check=1
+else
+	check=0
+fi
+
+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
+
+if [ "$check" == "1" ]; then
+	if [ "$DCPOMATIC_TEST_PRIVATE" == "" ]; then
+		pushd ../dcpomatic-test-private
+	else
+		pushd $DCPOMATIC_TEST_PRIVATE
+	fi
+	current=$(git rev-parse HEAD)
+	if [ "$current" != "$PRIVATE_GIT" ]; then
+		echo "Unexpected dcpomatic-test-private version"
+		exit 1
+	fi
+	popd
+fi
 
-export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DCPOMATIC_LINUX_SHARE_PREFIX=`pwd`
 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" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
 elif [ "$1" == "--valgrind" ]; then
     shift;
 #    valgrind --tool="memcheck" --vgdb=yes --vgdb-error=0 build/test/unit-tests $*
-    valgrind --tool="memcheck" 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 $*
+    build/test/unit-tests --catch_system_errors=no $*
 fi