X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=12d59346d9a7020fc55654dd5ea0043b44e2a5aa;hb=5b10ee366f819c05d69ea8e78c8348eca99721b5;hp=512a497a6f3a64f9abf47a3e098e234cf76dd3d6;hpb=7ea73fdcfa96aac86546b80b6e6c2edbdd524199;p=dcpomatic.git diff --git a/run/tests b/run/tests index 512a497a6..12d59346d 100755 --- a/run/tests +++ b/run/tests @@ -3,7 +3,7 @@ # e.g. --run_tests=foo set -e -PRIVATE_GIT="b6277c54428e0abe2003c27868fe8f02119ef869" +PRIVATE_GIT="59b62615a48a1f3a70e9c028b92dfba75c1719ba" if [ "$1" == "--check" ]; then shift 1 @@ -19,6 +19,16 @@ if [ "$(uname)" == "Linux" ]; then if [ ! -f build/test/dcpomatic2_openssl ]; then ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl fi + export DCPOMATIC_TEST_TOOLS_PATH=/opt/asdcplib/bin + if [ -f /src/backports/dcp_inspect ]; then + export DCPOMATIC_DCP_INSPECT=/src/backports/dcp_inspect + fi + set +e + python3 -m clairmeta.cli --help > /dev/null 2>&1 + if [ "$?" == "0" ]; then + export DCPOMATIC_CLAIRMETA=1 + fi + set -e fi if [ "$(uname)" == "Darwin" ]; then