X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=65e06e750d109dd07476bca19f2d3b0c5862cb5b;hb=4f2fcd8a163ec540dc1676801d355710584d9138;hp=8b54d2b457757a174818b6cc63e112bd0cd287b5;hpb=98fa5c8c95587e1b016a1432371d58288c94b145;p=dcpomatic.git

diff --git a/run/tests b/run/tests
index 8b54d2b45..65e06e750 100755
--- a/run/tests
+++ b/run/tests
@@ -1,12 +1,54 @@
 #!/bin/bash
 #
 # e.g. --run_tests=foo
+set -e
+
+PRIVATE_GIT="73e4119fdf693619684cb0c4f07f8f91388e0617"
+
+if [ "$1" == "--check" ]; then
+	shift 1
+	check=1
+else
+	check=0
+fi
 
 if [ "$(uname)" == "Linux" ]; then 
-  export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-  rm -f build/test/openssl
+  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
-  ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl
+  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
 
 if [ "$1" == "--debug" ]; then
@@ -33,6 +75,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