X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=run%2Ftests;h=56a4f1294dad0440438ab7d4a2b0961cc625f617;hb=3616368185ce28e23da7bb51028e18639da454db;hp=e31a97be0c042c58939ce688c55f182ba300462a;hpb=e1aff661376877bac097f29329f94e157c4caa11;p=dcpomatic.git

diff --git a/run/tests b/run/tests
index e31a97be0..56a4f1294 100755
--- a/run/tests
+++ b/run/tests
@@ -1,9 +1,57 @@
 #!/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:/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
+	./check_sums || (echo "dcpomatic-test-private checksums are incorrect"; exit 1)
+	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 --log_level=test_suite $*
@@ -28,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