Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-08-13 13:56:27 -0400
committerDavid Williams2015-08-13 13:56:27 -0400
commitc437be487ddfe1850905e8f2447721fa0e63da79 (patch)
tree6610ce6f891a461b7f021ce3d985965f390519b7 /production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
parentcf991c65f1a5fc9d9ff0a90935e445ee39102e23 (diff)
downloadeclipse.platform.releng.aggregator-c437be487ddfe1850905e8f2447721fa0e63da79.tar.gz
eclipse.platform.releng.aggregator-c437be487ddfe1850905e8f2447721fa0e63da79.tar.xz
eclipse.platform.releng.aggregator-c437be487ddfe1850905e8f2447721fa0e63da79.zip
Bug 474822 - May need to better control/setup Windows environment for
tests
Diffstat (limited to 'production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh')
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
index 023cf5e6..36f55bfe 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh
@@ -6,12 +6,12 @@ ulimit -c unlimited
# somewhere on the search path ($HOME/bin is common),
# and it will be included here, thus can provide "override values"
# to those defined by defaults for production machine.,
-# such as for vmcmd
+# such as for jvm
source localBuildProperties.shsource 2>/dev/null
echo "PWD: $PWD"
-vmcmd=${vmcmd:-/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java}
+jvm=${jvm:-/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java}
# production machine is x86_64, but some local setups may be 32 bit and will need to provide
@@ -19,11 +19,11 @@ vmcmd=${vmcmd:-/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Comman
eclipseArch=${eclipseArch:-x86}
# vm.properties is used by default on production machines, but will
-# need to override on local setups to specify appropriate vm (usually same as vmcmd).
+# need to override on local setups to specify appropriate vm (usually same as jvm).
# see bug 388269
propertyFile=${propertyFile:-vm.properties}
-echo "vmcmd in testAll: ${vmcmd}"
+echo "jvm in testAll: ${jvm}"
echo "extdir in testAll (if any): ${extdir}"
echo "propertyFile in testAll: ${propertyFile}"
@@ -33,7 +33,7 @@ echo "propertyFile in testAll: ${propertyFile}"
if [[ -n "${extdir}" ]]
then
- ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${jvm}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
else
- ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
+ ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${jvm}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
fi

Back to the top