diff options
| author | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
|---|---|---|
| committer | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
| commit | 9fce91044649c9f97bd94c5791a10270afad7570 (patch) | |
| tree | a69fa244ddeb78e52248d4306a4ecc6b27e924da /make/scripts/tests-osx-x64.sh | |
| parent | 5116d72f0150bdd6353ee664ef76e414bd61f87e (diff) | |
| parent | bfb10d309d97c19a33f9b6758f647186f8e0ddd6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'make/scripts/tests-osx-x64.sh')
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index fe2d2c4ec..e1b07202b 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -2,11 +2,11 @@ export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH -JAVA_HOME=`/usr/libexec/java_home -version 1.6` +JAVA_HOME=`/usr/libexec/java_home -version 1.7` 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 $* |