295153 Can streamline unit test scripts
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index a70740a..245923a 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -5,12 +5,12 @@
     <property
         environment="env"/>
 
-  <!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
     <echo
-	      level="debug"
+        level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
@@ -18,13 +18,12 @@
         name="init">
         <!--
             Parameters: (Mandatory) data-dir - the workspace directory
-            for Eclipse to write its data plugin-name - directory name 
-            of plugin
-            (with version suffix) classname - the name of the test class
-            (Optional - overrides defaults set in script) extraVMargs -
-            allows separate setting of VM args from separate caller.
-            timeout - overrides default test timeout value (in
-            milliseconds).
+            for Eclipse to write its data plugin-name - directory name
+            of plugin (with version suffix) classname - the name of the
+            test class (Optional - overrides defaults set in script)
+            extraVMargs - allows separate setting of VM args from
+            separate caller. timeout - overrides default test timeout
+            value (in milliseconds).
         -->
         <property
             name="junit-report-output"
@@ -32,38 +31,36 @@
         <mkdir
             dir="${junit-report-output}/raw"/>
         <!--
-            if not otherwise set, be sure extraVMargs is at least empty
-            string
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
-		<!-- if not otherwise set, use a unique workspace name -->
+        <!-- if not otherwise set, use a unique workspace name -->
         <property
             name="data-dir"
             value="${testRoot}/junitworkspaces/workspace-${classname}"/>
         <property
             name="testRoot"
             value="${testRoot}"/>
-    	  <!-- temporarily changed from 30 minutes to 1 hrs 
-    	  to help spot problematic tests -->
-      <!--
-        Some common values, of milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-      -->
-
+        <!--
+            temporarily changed from 30 minutes to 1 hrs to help spot
+            problematic tests
+        -->
+        <!--
+            Some common values, of milliseconds to more recognizable
+            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
+            1800000: 30 minutes 600000: 10 minutes
+        -->
         <property
             name="timeout"
             value="3600000"/>
         <property
             name="junit-report-output"
             value="${junit-report-output}"/>
-         <property
+        <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
         <property
@@ -81,7 +78,6 @@
         <echo
             level="debug"
             message="plugin-name: ${plugin-name}"/>
-
         <echo
             level="debug"
             message="classname: ${classname}"/>
@@ -100,7 +96,6 @@
         <echo
             level="debug"
             message="eclipse-home: ${eclipse-home}"/>
-
         <echo
             level="debug"
             message="junit-report-output: ${junit-report-output}"/>
@@ -208,9 +203,12 @@
                 value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
-
             <jvmarg
-                line="${extraVMargs}"/>
+                value="${extraVMargs}"/>
+            <jvmarg
+                value="-Declipse.consolelog=true"/>
+            <jvmarg
+                value="-Dosgi.debug=true"/>
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
@@ -218,10 +216,6 @@
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -280,14 +274,11 @@
             basedir="${junit-report-output}"
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
-
     </target>
     <target
         name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
+        <echo
+            message="The 'collect' task is deprecated. It does nothing. Please remove the call to 'collect' task from your test.xml"/>
     </target>
     <target
         name="summarizeFailure"