sync back test of tests

1 files changed, 15 insertions, 2 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
index af2883797..b284ac4a8 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