Only check test private data if --check is passed.

[dcpomatic.git] / run / tests

diff --git a/run/tests b/run/tests
index 0c5c8c0c358fc46a8071b7569bc5f3ab2d62007d..56a4f1294dad0440438ab7d4a2b0961cc625f617 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -1,9 +1,19 @@
 #!/bin/bash
 #
 # e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="a462680c7c6df8a84f9ee0bb7b4fb90055b96ca8"
+
+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 
@@ -18,14 +28,30 @@ 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/ci/osx-environment/x86_64/10.10/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
 
+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 $*
@@ -50,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