diff options
| author | Sven Gothel <[email protected]> | 2019-08-19 11:14:09 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-19 11:14:09 +0200 |
| commit | 4eaa83358b6518c667e9517685eeaafaef692656 (patch) | |
| tree | 087ee626374d45c12bd0aa9eb0d978056aec34fb /make/scripts/tests-osx-x64.sh | |
| parent | 2dd5b6040858cbec29710be8e68374f46121a39a (diff) | |
Bug 1363: Java 11: Adapt scripts for java11 (cont)
Diffstat (limited to 'make/scripts/tests-osx-x64.sh')
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 949adc045..d0f244e93 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -5,10 +5,8 @@ export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH #JAVA_HOME=`/usr/libexec/java_home` -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` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH @@ -16,5 +14,5 @@ export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` -. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $* |