sync back test of tests

3 files changed, 8 insertions, 12 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/org.eclipse.core.net.prefs b/production/testScripts/configuration/sdk.tests/testConfigs/linux/org.eclipse.core.net.prefsHOLD
index a073528e3..a073528e3 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/org.eclipse.core.net.prefs
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/org.eclipse.core.net.prefsHOLD
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
index c5ed7b3ac..58018221c 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
@@ -11,8 +11,15 @@
 source localTestsProperties.shsource 2>/dev/null
 
 echo "PWD: $PWD"
+
+# 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=${vmcmd:-/shared/common/jdk1.8.0_x64-latest/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}
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
index 18fdbec35..70b954c3e 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
@@ -10,19 +10,8 @@
 ###############################################################################
 platform=linux.gtk.x86_64_8.0
 
+#platformSuffix=Ubuntu12.04
 #jvm=/shared/common/jdk1.6.0-latest/jre/bin/java
 #jvm=/shared/common/jdk1.7.0-latest/jre/bin/java
 jvm=/shared/common/jdk1.8.0_x64-latest/jre/bin/java
 
-# 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
-