X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=393d9b6ed65e03c10b118feec03d63731aed27d0;hb=60a18867b26c56bff3c71aa752dbaea6b03aaebf;hp=ab0fcf2f51ba43432e796e3c8d12ae1674430010;hpb=47d83b296248119d04b9226fd51a67e2fd3faac5;p=dcpomatic.git

diff --git a/run/tests b/run/tests
index ab0fcf2f5..393d9b6ed 100755
--- a/run/tests
+++ b/run/tests
@@ -1,9 +1,19 @@
 #!/bin/bash
 #
 # e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="2d7238cd99d0468d59c27b3371cd87679c79901f"
+
+if [ "$1" == "--check" ]; then
+	shift 1
+	check=1
+else
+	check=0
+fi
 
 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 
@@ -27,6 +37,21 @@ if [ "$(uname)" == "Darwin" ]; then
   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
+	./check_sums || (echo "dcpomatic-test-private checksums are incorrect"; exit 1)
+	popd
+fi
+
 if [ "$1" == "--debug" ]; then
     shift;
     gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
@@ -51,6 +76,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