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

diff --git a/run/tests b/run/tests
index 3a7861ae0..d34ae5b11 100755
--- a/run/tests
+++ b/run/tests
@@ -1,9 +1,12 @@
 #!/bin/bash
 #
 # e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="a462680c7c6df8a84f9ee0bb7b4fb90055b96ca8"
 
 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,11 +21,23 @@ 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/carl/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
+
+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
 
 if [ "$1" == "--debug" ]; then
     shift;
@@ -48,6 +63,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