Fix macOS environment setup.

diff --git a/cscript b/cscript
index ba680eb0e829d36250096fc5dc0b72668943e2eb..37f824fb1afacef7e49f6e8dec9f95aedc7c8123 100644 (file)
--- a/cscript
+++ b/cscript
@@ -925,7 +925,10 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests --check --log_level=test_suite '
+        cmd = 'run/tests '
+    if target.environment_prefix:
+        cmd += '-e %s ' % target.environment_prefix
+    cmd += ' --check --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None:

diff --git a/run/environment b/run/environment
index aa4f77187b63c7b96edabeeb37f74aaf39c41bcc..dac7bef55e4354c2f09372ab6ca2a77bffdb4aa6 100644 (file)
--- a/run/environment
+++ b/run/environment
@@ -4,6 +4,6 @@ export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/
 if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then
   export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH
 fi
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib
+export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/Users/ci/workspace/lib
 export DCPOMATIC_GRAPHICS=$DIR/../graphics
 

diff --git a/run/tests b/run/tests
index bf4c5732edb16d0f5bac2436e1744c5ee6d3c283..5db647af48f6faf136e7285bd626951d0f8fc9b7 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -5,12 +5,52 @@ set -e
 
 PRIVATE_GIT="881c48805e352dfe150993814757ca974282be18"
 
-if [ "$1" == "--check" ]; then
-       shift 1
-       check=1
-else
-       check=0
-fi
+type=""
+check=0
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -e)
+        environment=$2
+        shift
+        shift
+        ;;
+        --debug)
+        type="debug"
+        shift
+        ;;
+        --backtrace)
+        type="backtrace"
+        shift
+        ;;
+        --valgrind)
+        type="valgrind"
+        shift
+        ;;
+        --callgrind)
+        type="callgrind"
+        shift
+        ;;
+        --quiet)
+        type="quiet"
+        shift
+        ;;
+        --drd)
+        type="drd"
+        shift
+        ;;
+        --helgrind)
+        type="helgrind"
+        shift
+        ;;
+        --check)
+        check=1
+        shift
+        ;;
+        *)
+        break
+        ;;
+    esac
+done
 
 if [ "$(uname)" == "Linux" ]; then 
   export LD_LIBRARY_PATH=build/src/lib:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH
@@ -42,7 +82,7 @@ if [ "$(uname)" == "Darwin" ]; then
   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
+  export DYLD_LIBRARY_PATH=$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
@@ -61,27 +101,20 @@ if [ "$check" == "1" ]; then
        popd
 fi
 
-if [ "$1" == "--debug" ]; then
-    shift;
+if [ "$type" == "debug" ]; then
     gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
-elif [ "$1" == "--backtrace" ]; then
-    shift;
+elif [ "$type" == "backtrace" ]; then
     gdb -batch -ex "run" -ex "thread apply all bt" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
-elif [ "$1" == "--valgrind" ]; then
-    shift;
+elif [ "$type" == "valgrind" ]; then
 #    valgrind --tool="memcheck" --vgdb=yes --vgdb-error=0 build/test/unit-tests $*
     valgrind --tool="memcheck" --suppressions=suppressions build/test/unit-tests $*
-elif [ "$1" == "--callgrind" ]; then
-    shift;
+elif [ "$type" == "callgrind" ]; then
     valgrind --tool="callgrind" build/test/unit-tests $*
-elif [ "$1" == "--quiet" ]; then
-    shift;
+elif [ "$type" == "quiet" ]; then
     build/test/unit-tests --catch_system_errors=no $*
-elif [ "$1" == "--drd" ]; then
-    shift;
+elif [ "$type" == "drd" ]; then
     valgrind --tool="drd" build/test/unit-tests $*
-elif [ "$1" == "--helgrind" ]; then
-    shift;
+elif [ "$type" == "helgrind" ]; then
     valgrind --tool="helgrind" build/test/unit-tests $*
 else
     ulimit -c unlimited