cleanup and prep for p2
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 0c53616..f5f44ce 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -12,9 +12,9 @@
message="testRoot must be set for this task"
unless="testRoot" />
- <!-- ===================================================================== -->
- <!-- Steps to do after the build is done. -->
- <!-- ===================================================================== -->
+ <!--
+ Steps to do after the build is done.
+ -->
<target
name="test">
<dirname
@@ -26,9 +26,9 @@
dir="${currentDirectory}" />
</target>
- <!-- ===================================================================== -->
- <!-- Steps to do to test the build results -->
- <!-- ===================================================================== -->
+ <!--
+ Steps to do to test the build results
+ -->
<target
name="runTest">
<dirname
@@ -62,7 +62,7 @@
todir="${testRoot}"
overwrite="true">
<fileset
- dir="${test.component.dir}/testScripts"></fileset>
+ dir="${test.component.dir}/testScripts" />
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
@@ -95,7 +95,7 @@
name="unzipTests">
<!--unzip the builds and junit tests
- we use 'unzip' here, so we can continue on error
+ we use 'unzip' here, so we can continue on error, if desired.
(such as if zip was not created, due to other failures or options).
-->
<exec
@@ -194,6 +194,8 @@
Remember: using -debug for org.eclipse.ant.core.antRunner
produces ant debug info to be output ... which is a TON of stuff
-->
+ <echo
+ message="eclipse.launcher: ${eclipse.launcher}" />
<java
taskname="unit-test-masterprocess"
fork="true"
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 8c08bb5..26e8ec7 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -2,8 +2,8 @@
name="Automated Eclipse Testing"
default="all"
basedir=".">
- <property environment="env" />
-
+ <property
+ environment="env" />
<echo
level="info"
message="starting Automated Eclipse Testing" />
@@ -65,7 +65,6 @@
name="jonas432Dir"
value="${testRoot}/${jonas432DirName}" />
</target>
-
<target
name="runtests"
description="Runs ant on the test.xml for a specified plugin.">
@@ -302,26 +301,20 @@
value="org.eclipse.wst.common.tests" />
</antcall>
</target>
-
-
- <target
- name="validation-framework-tests"
- depends="init"
- description="Runs the common validation tests">
- <antcall
- target="runtests">
- <param
- name="testPlugin"
- value="${org.eclipse.wst.common.tests.validation}" />
- <param
- name="report"
- value="org.eclipse.wst.common.tests.validation" />
- </antcall>
- </target>
-
-
-
-
+ <target
+ name="validation-framework-tests"
+ depends="init"
+ description="Runs the common validation tests">
+ <antcall
+ target="runtests">
+ <param
+ name="testPlugin"
+ value="${org.eclipse.wst.common.tests.validation}" />
+ <param
+ name="report"
+ value="org.eclipse.wst.common.tests.validation" />
+ </antcall>
+ </target>
<target
name="wst-common-snippets-tests"
depends="init">
@@ -677,7 +670,6 @@
name="report"
value="org.eclipse.jst.jsf.context.symbol.tests" />
</antcall>
-
<antcall
target="runtests">
<param
@@ -687,7 +679,6 @@
name="report"
value="org.eclipse.jst.jsf.designtime.tests" />
</antcall>
-
<antcall
target="runtests">
<param
@@ -873,14 +864,11 @@
message="Starting wst-common-tests" />
<antcall
target="wst-common-tests" />
-
-
- <echo
- level="info"
- message="Starting validation-framework-tests" />
- <antcall
- target="validation-framework-tests" />
-
+ <echo
+ level="info"
+ message="Starting validation-framework-tests" />
+ <antcall
+ target="validation-framework-tests" />
<echo
level="info"
message="Starting wst-common-snippets-tests" />
@@ -1042,7 +1030,8 @@
value="${eclipse-home}/plugins" />
<arg
value="${testRoot}/test2.properties" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
</java>
</target>
<target