X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Ftests;h=0fafa3c5e9a7d18e7dee0dd02c1f1cc727923843;hp=d34ae5b1169c16f27aca75f5c37a4d59b5e8db67;hb=d3ecb8495a42d039b07313e393734c49fdc6be66;hpb=e9c91414ade10f93bb23b33d48d30bf80045d7b1 diff --git a/run/tests b/run/tests index d34ae5b11..0fafa3c5e 100755 --- a/run/tests +++ b/run/tests @@ -3,7 +3,14 @@ # e.g. --run_tests=foo set -e -PRIVATE_GIT="a462680c7c6df8a84f9ee0bb7b4fb90055b96ca8" +PRIVATE_GIT="6ae250072192de2e56243da1883a6fa13e56aaf4" + +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 @@ -30,14 +37,20 @@ if [ "$(uname)" == "Darwin" ]; then 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 -./check_sums || (echo "dcpomatic-test-private checksums are incorrect"; exit 1) -popd if [ "$1" == "--debug" ]; then shift;