Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-04-13 03:12:16 -0400
committerDavid Williams2014-04-13 03:12:16 -0400
commit340ee56d3505331e7594c150cb96abb47698519e (patch)
treeb1f43b49b39df668071f23d1bd6ae38693cb8d91 /production/testScripts/configuration/sdk.tests/testConfigs/macosx
parentdff3fe6ef0280c78185d85db1006495e928502d5 (diff)
downloadeclipse.platform.releng.aggregator-340ee56d3505331e7594c150cb96abb47698519e.tar.gz
eclipse.platform.releng.aggregator-340ee56d3505331e7594c150cb96abb47698519e.tar.xz
eclipse.platform.releng.aggregator-340ee56d3505331e7594c150cb96abb47698519e.zip
sync back test of tests
Diffstat (limited to 'production/testScripts/configuration/sdk.tests/testConfigs/macosx')
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh17
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties12
2 files changed, 16 insertions, 13 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
index af288379..b284ac4a 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
@@ -13,6 +13,14 @@ source localTestsProperties.shsource 2>/dev/null
echo "PWD: $PWD"
vmcmd=${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java}
+# This is the VM used to start the "ant runner" process.
+# It can be, but does not have to be, the same Java that's used for
+# running the tests. The Java can be (optionally) defined in 'vm.properties'.
+# But, occasionally we do need to know exact path to VM, such as see bug 390286
+${vmcmd:-/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java}
+
+# TODO: This doesn't seem all that useful. Should be removed.
+# But, allow values to be specified in vm.properties, as well as command line?
# production machine is x86_64, but some local setups may be 32 bit and will need to provide
# this value in localTestsProperties.shsource.
eclipseArch=${eclipseArch:-x86_64}
@@ -25,6 +33,7 @@ propertyFile=${propertyFile:-vm.properties}
echo "vmcmd in testAll: ${vmcmd}"
echo "extdir in testAll (if any): ${extdir}"
echo "propertyFile in testAll: ${propertyFile}"
+echo "buildId in testAll: ${buildId}"
echo "contents of propertyFile:"
cat ${propertyFile}
@@ -32,9 +41,13 @@ cat ${propertyFile}
/bin/chmod 755 runtestsmac.sh
/bin/mkdir -p results/consolelogs
+#TODO: console logs can be renamed at end of process, with more exact names, if need,
+#such as to reflect bitness, and VM level.
+consoleLog="results/consolelogs/macosx-${buildId}_consolelog.txt"
+
if [[ -n "${extdir}" ]]
then
-./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt
+./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > ${consoleLog}
else
-./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt
+./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > ${consoleLog}
fi
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
index 83b11f6c..8e4a3ece 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
@@ -17,14 +17,4 @@ jvm=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java
# VM argument required to specify that location.
loglocationarg=-XX:ErrorFile
-# currently this variable is "hard coded" to work on Hudson.
-# not required if no proxies to use or bypass
-# TODO: make more sensitive to env. setttings in future so can
-# support tests on non Ecipse Infrastructure
-# If this property is defined, and file exists, the Eclipse infrastructure
-# will copy these "preferences" to
-# ${executionDir}/test-eclipse/eclipse/configuration/.settings/
-# after the test instance of eclipse is installed.
-# It is assumed the file itself gets copied to "execution directory" by
-# runTests2.xml approx. line 488
-org.eclipse.core.net.prefs=org.eclipse.core.net.prefs
+

Back to the top