diff options
Diffstat (limited to 'make/scripts/tests-osx-x64.sh')
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 748cf39a9..c95c69bed 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -1,9 +1,16 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH -spath=`dirname $0` +JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` +#JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH -. $spath/tests.sh /usr/bin/java -d64 ../build-macosx $* +spath=`dirname $0` +. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx $* |