diff options
| author | Sven Gothel <[email protected]> | 2015-07-24 21:58:40 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-07-24 21:58:40 +0200 |
| commit | cc3aa4f6e72171162476ee3e858c1949c4b577f2 (patch) | |
| tree | 71308a4d20468a98659c9e722b5f66de947372d3 /make/scripts | |
| parent | 6436b49405a7436d7df4ffd83602615cb9ae10a0 (diff) | |
fix osx 32bit/java6 test scripts
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests-osx-x32.sh | 12 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64-java6.sh | 10 |
2 files changed, 18 insertions, 4 deletions
diff --git a/make/scripts/tests-osx-x32.sh b/make/scripts/tests-osx-x32.sh index e7f4f01ef..12678d966 100755 --- a/make/scripts/tests-osx-x32.sh +++ b/make/scripts/tests-osx-x32.sh @@ -1,7 +1,17 @@ #! /bin/bash +#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 + +#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=`dirname $0` -. $spath/tests.sh /usr/bin/java -d32 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -d32 ../build-macosx-java6 $* diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh index b8190f0d7..93ca77a6b 100755 --- a/make/scripts/tests-osx-x64-java6.sh +++ b/make/scripts/tests-osx-x64-java6.sh @@ -1,12 +1,16 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/libav:$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 -JAVA_HOME=`/usr/libexec/java_home -version 1.6` +#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=`dirname $0` -. $spath/tests.sh /usr/bin/java -d64 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx-java6 $* |