fixes to xsl test infrastructure

releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml

@@ -24,9 +24,6 @@
         name="eclipse-home"
         value="${install}/eclipse" />
 
-    <!-- The path to libary.xml -->
-    <!--property name="library-file" value="${eclipse-home}/plugins/${org.eclipse.test}/library.xml" /-->
-
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
         name="results"

releng.wtpbuilder/distribution/incubator.tests/build.xml

@@ -163,62 +163,47 @@
         <echo
             message="eclipse.launcher: ${eclipse.launcher}" />
         <java
-            jar="${eclipse.launcher}"
             taskname="unit-test-masterprocess"
             fork="true"
             resultProperty="wtpmasterjunitresult"
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java">
-            <jvmarg
-                value="-Xms256m" />
-            <jvmarg
-                value="-Xmx512m" />
-            <jvmarg
-                value="-Declipse.launcher=${testRoot}/eclipse/startup.jar" />
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg
-                value="-Dws=${env.BASEWS}" />
-            <jvmarg
-                value="-Dos=${env.BASEOS}" />
-            <jvmarg
-                value="-Darch=${env.BASEARCH}" />
-            <jvmarg
-                value="-Dosgi.debug='false'" />
-            <jvmarg
-                value="-Dosgi.clean=true" />
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}" />
-            <jvmarg
-                value="-DbuildType=${buildType}" />
-            <jvmarg
-                value="-DbuildId=${buildId}" />
-            <arg
-                value="-nosplash" />
-            <arg
-                value="-consolelog" />
-            <arg
-                value="-data" />
-            <arg
-                value="${testRoot}/overallTestWorkspace" />
-            <arg
-                value="-application" />
-            <arg
-                value="org.eclipse.ant.core.antRunner" />
-            <arg
-                value="-file" />
-            <arg
-                value="${testRoot}/test.xml" />
-            <arg
-                value="-logger" />
-            <arg
-                value="org.apache.tools.ant.DefaultLogger" />
+            jvm="${env.JAVA_5_HOME}/bin/java"
+            classname="org.eclipse.equinox.launcher.Main">
+            <classpath>
+                <fileset dir="${testRoot}/eclipse/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar" />
+                </fileset>
+            </classpath>
+
+            <jvmarg value="-Xms256m" />
+            <jvmarg value="-Xmx512m" />
+
+            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+            <jvmarg value="-Dws=${env.BASEWS}" />
+            <jvmarg value="-Dos=${env.BASEOS}" />
+            <jvmarg value="-Darch=${env.BASEARCH}" />
+
+            <jvmarg value="-Dosgi.clean=true" />
+            <jvmarg value="-Dnoclean=true" />
+            <jvmarg value="-DbuildBranch=${buildBranch}" />
+            <jvmarg value="-DbuildType=${buildType}" />
+            <jvmarg value="-DbuildId=${buildId}" />
+
+            <arg value="-nosplash" />
+            <arg value="-consolelog" />
+
+            <arg value="-data" />
+            <arg value="${testRoot}/overallTestWorkspace" />
+            <arg value="-application" />
+            <arg value="org.eclipse.ant.core.antRunner" />
+            <arg value="-file" />
+            <arg value="${testRoot}/test.xml" />
+            <arg value="-logger" />
+            <arg value="org.apache.tools.ant.DefaultLogger" />
             <env
                 key="DISPLAY"
                 value="${env.DISPLAY}" />

releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml

@@ -8,10 +8,10 @@
         message="starting Automated Eclipse Testing" />
 		
     <echo
-        level="debug"
+        level="info"
         message="basedir: ${basedir}" />
     <echo
-        level="debug"
+        level="info"
         message="testRoot: ${testRoot}" />
 
     <fail
@@ -36,9 +36,6 @@
         name="eclipse-home"
         value="${testRoot}/eclipse" />
 
-    <!-- The path to libary.xml -->
-    <!--property name="library-file" value="${eclipse-home}/plugins/${org.eclipse.test}/library.xml" /-->
-
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
         name="results"
@@ -54,30 +51,6 @@
         name="setup"
         if="clean"
         description="Reinstall the test Eclipse installation if specified by user">
-        <delete dir="${install}" />
-        <mkdir dir="${install}" />
-    	
-    	<!-- ? invalid! Never called? 
-        <exec
-            dir="."
-            executable="unzip">
-            <arg line="-o -qq ../downloads/*.zip -d ${install}" />
-        </exec>
-      -->
-    	<echo message="installing xsl sdk"/>
-      <exec
-          dir="."
-          executable="unzip">
-          <arg
-              line="-o -qq  wtp-incubator-xsl_sdk-*.zip -d ${install}" />
-      </exec>
-      <echo message="installing xsl tests"/>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq  wtp-incubator-xsl-tests-*.zip -d ${install}" />
-        </exec>
 
     </target>
 

releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml

@@ -38,9 +38,6 @@
         name="eclipse-home"
         value="${testRoot}/eclipse" />
 
-    <!-- The path to libary.xml -->
-    <!--property name="library-file" value="${eclipse-home}/plugins/${org.eclipse.test}/library.xml" /-->
-
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
         name="results"

releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml

@@ -38,9 +38,6 @@
         name="eclipse-home"
         value="${testRoot}/eclipse" />
 
-    <!-- The path to libary.xml -->
-    <!--property name="library-file" value="${eclipse-home}/plugins/${org.eclipse.test}/library.xml" /-->
-
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
         name="results"