Use run/environment for paths in run/tests.

[dcpomatic.git] / run / tests

diff --git a/run/tests b/run/tests
index 7f8126fa306cf954c97c4d0e2b1b177ecfa40f62..a750fde101b81e943c6ae3fcc064405737a95feb 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -3,7 +3,10 @@
 # e.g. --run_tests=foo
 set -e
 
-PRIVATE_GIT="b6277c54428e0abe2003c27868fe8f02119ef869"
+PRIVATE_GIT="881c48805e352dfe150993814757ca974282be18"
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
 
 if [ "$1" == "--check" ]; then
        shift 1
@@ -13,7 +16,6 @@ else
 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 
@@ -23,6 +25,12 @@ if [ "$(uname)" == "Linux" ]; then
   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
@@ -35,8 +43,6 @@ if [ "$(uname)" == "Darwin" ]; then
   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