From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Apr 2024 21:41:33 +0000 (+0200)
Subject: Use run/environment for paths in run/tests.
X-Git-Tag: v2.17.16^2~14
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=b94546264660e266de6828bdd8a3e176c66903a8;hp=f72a79c93626e773214f1a0318adf2445ac2ee72;p=dcpomatic.git

Use run/environment for paths in run/tests.
---

diff --git a/run/tests b/run/tests
index bf4c5732e..a750fde10 100755
--- 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