From b8398de38ab55146ee1f19549aa659e5d6a516e2 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 8 Mar 2014 00:25:09 -0500 Subject: Bug 429571 - [BETA_JAVA8] Run various tests involving BETA_JAVA8 work --- .../testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh | 2 +- .../configuration/sdk.tests/testConfigs/macosx/vm.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'production/testScripts/configuration/sdk.tests/testConfigs/macosx') diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh index 02851aaff..af2883797 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh @@ -11,7 +11,7 @@ ulimit -c unlimited source localTestsProperties.shsource 2>/dev/null echo "PWD: $PWD" -vmcmd=${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home/jre/bin/java} +vmcmd=${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java} # production machine is x86_64, but some local setups may be 32 bit and will need to provide # this value in localTestsProperties.shsource. diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties index ccc22622f..031d6a072 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties @@ -10,7 +10,7 @@ ############################################################################### platform=macosx.cocoa.x86_5.0 # J2SE-6.0=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java -J2SE-6.0=/Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home/jre/bin/java +J2SE-6.0=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java # https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213 # If this property is set, the actual location and file name # is computed at test time, but this is assumed to be the -- cgit v1.2.3