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

diff --git a/cscript b/cscript
index 0d5cffbf6a6ab444373a4e5f42ba74c97742ed7b..ddb3a807d3125164c788a5b722a88b7a1a44e6eb 100644 (file)
--- a/cscript
+++ b/cscript
@@ -858,7 +858,7 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:

-        cmd = 'run/tests --log_level=test_suite '
+        cmd = 'run/tests --check --log_level=test_suite '

     if target.debug:
         cmd += '--backtrace '
     if test is not None:
     if target.debug:
         cmd += '--backtrace '
     if test is not None:

diff --git a/run/tests b/run/tests
index d34ae5b1169c16f27aca75f5c37a4d59b5e8db67..56a4f1294dad0440438ab7d4a2b0961cc625f617 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -5,6 +5,13 @@ set -e
 
 PRIVATE_GIT="a462680c7c6df8a84f9ee0bb7b4fb90055b96ca8"
 
 
 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
 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


@@ -30,14 +37,20 @@ if [ "$(uname)" == "Darwin" ]; then
   export PATH=$PATH:/Users/ci/workspace/bin
 fi
 
   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
+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
 fi

-./check_sums || (echo "dcpomatic-test-private checksums are incorrect"; exit 1)
-popd

 
 if [ "$1" == "--debug" ]; then
     shift;
 
 if [ "$1" == "--debug" ]; then
     shift;