Use run/environment for paths in run/tests.

diff --git a/run/tests b/run/tests
index bf4c5732edb16d0f5bac2436e1744c5ee6d3c283..a750fde101b81e943c6ae3fcc064405737a95feb 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -5,6 +5,9 @@ set -e
 
 PRIVATE_GIT="881c48805e352dfe150993814757ca974282be18"
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--check" ]; then
        shift 1
        check=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 
@@ -41,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