diff --git a/releng.wtpbuilder/distribution/incubator.tests/build.xml b/releng.wtpbuilder/distribution/incubator.tests/build.xml
index f25d422c498d75c67e9fa2ea69c94e9ddf493b2e..fa1001d308b7fdc376d8d08d52423506609344f4 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/build.xml
@@ -92,18 +92,12 @@
we use 'unzip' here, so we can continue on error
(such as if zip was not created, due to other failures or options).
-->
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}" />
- </exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-incubator-tests-${buildLabel}.zip -d ${testRoot}" />
+ line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}" />
</exec>
</target>
diff --git a/releng.wtpbuilder/distribution/incubator.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/incubator.tests/standaloneTest.xml
deleted file mode 100644
index 2fbc25ccc1cce6c7659df961128482d006c1a5fa..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/incubator.tests/standaloneTest.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<project
- default="main"
- basedir=".">
-
- <!--
- Required inputs:
-
- build.home
- buildType
- buildId
- timestamp
- build.stream [optional]
- build.committers [optional]
- testTarget [optional]
- -->
-
- <property environment="env" />
-
- <target name="main">
- <property
- file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
- <property
- name="local.cache.dir"
- value="${env.LOCAL_PREREQS_CACHE}" />
- <property
- name="testRoot"
- value="${build.home}/testRoot" />
- <delete
- dir="${testRoot}"
- failonerror="false" />
- <mkdir dir="${testRoot}" />
- <antcall target="getReleng" />
- <property
- file="${testRoot}/${env.RELENG}/maps/dependencies.properties" />
- <antcall target="getDependencies" />
- <condition
- property="wtp-sdk"
- value="wtp-sdk-${buildId}.zip"
- else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
- <available file="${local.cache.dir}/wtp-sdk-${buildId}.zip" />
- </condition>
- <condition
- property="wtp-wst-tests"
- value="wtp-wst-Automated-Tests-${buildId}.zip"
- else="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
- <available
- file="${local.cache.dir}/wtp-wst-Automated-Tests-${buildId}.zip" />
- </condition>
- <condition
- property="wtp-jst-tests"
- value="wtp-jst-Automated-Tests-${buildId}.zip"
- else="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
- <available
- file="${local.cache.dir}/wtp-jst-Automated-Tests-${buildId}.zip" />
- </condition>
- <antcall target="run" />
- </target>
-
- <target name="getReleng">
- <property
- name="releng.tag"
- value="v${buildType}${timestamp}" />
- <cvs
- cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
- package="${env.RELENG}"
- dest="${testRoot}"
- command="export"
- tag="${releng.tag}"
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- </target>
-
- <target name="getDependencies">
- <ant
- antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
- <property
- name="base.install.dir"
- value="${testRoot}" />
- <property
- name="dependencyTargets"
- value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
- </ant>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-sdk-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-wst-Automated-Tests-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-jst-Automated-Tests-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- </target>
-
- <target name="getAndInstallWTP">
- <available
- file="${local.cache.dir}/${file}"
- property="file.exists" />
- <antcall target="getWTP" />
- <available
- file="${local.cache.dir}/${file}"
- property="file.exists" />
- <antcall target="installWTP" />
- </target>
-
- <target name="getWTP">
- <condition
- property="file.url.1"
- value="http://download.eclipse.org/webtools/committers"
- else="http://download.eclipse.org/webtools/downloads">
- <isset property="build.committers" />
- </condition>
- <condition
- property="file.url"
- value="${file.url.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}"
- else="${file.url.1}/drops/${buildType}-${buildId}-${timestamp}">
- <isset property="build.stream" />
- </condition>
- <antcall target="getWTP2" />
- </target>
-
- <target
- name="getWTP2"
- unless="file.exists">
- <property
- name="file.url"
- value="http://download.eclipse.org/webtools/downloads/drops/${build.stream}/${buildType}-${buildId}-${timestamp}" />
- <get
- dest="${local.cache.dir}/${file}"
- src="${file.url}/${file}"
- ignoreerrors="true" />
- </target>
-
- <target
- name="installWTP"
- if="file.exists">
- <unzip
- src="${local.cache.dir}/${file}"
- dest="${testRoot}"
- overwrite="true" />
- </target>
-
- <target name="run">
- <mkdir dir="${testRoot}/results/consolelogs" />
- <copy
- todir="${testRoot}"
- flatten="true"
- overwrite="true">
- <fileset
- dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
- </copy>
- <ant
- antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
- target="runTestEclipse">
- <property
- name="testRoot"
- value="${testRoot}" />
- <property
- name="testTarget"
- value="all" />
- </ant>
- <copy
- file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
- todir="${testRoot}/results"
- overwrite="true" />
- </target>
-
- <target
- name="upload"
- if="login">
- <mkdir dir="${build.home}/archives" />
- <zip
- destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
- basedir="${build.home}/testRoot/results" />
- <condition
- property="upload.path.1"
- else="~/downloads/webtools/downloads"
- value="~/downloads/webtools/committers">
- <isset property="build.committers" />
- </condition>
- <condition
- property="upload.path"
- else="${upload.path.1}/drops/${buildType}-${buildId}-${timestamp}/testResults/${config}"
- value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}/testResults/${config}">
- <isset property="build.stream" />
- </condition>
- <exec
- executable="ssh"
- dir="${build.home}">
- <arg
- line="${login}@download1.eclipse.org rm -rf ${upload.path}" />
- </exec>
- <exec
- executable="ssh"
- dir="${build.home}">
- <arg
- line="${login}@download1.eclipse.org mkdir ${upload.path}" />
- </exec>
- <exec
- executable="scp"
- dir="${build.home}">
- <arg
- line="-r ./testRoot/results ${login}@download1.eclipse.org:${upload.path}" />
- </exec>
- </target>
-
- <target
- name="clean"
- if="clean">
- <property
- file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
- <property
- name="local.cache.dir"
- value="${env.LOCAL_PREREQS_CACHE}" />
- <property
- name="testRoot"
- value="${build.home}/testRoot" />
- <delete
- dir="${testRoot}"
- failonerror="false" />
- <delete failonerror="false">
- <fileset
- dir="${local.cache.dir}"
- includes="wtp-*" />
- </delete>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
index 2ea3d02064fbc9405817bde3f159c6af2bbdb85a..9858df91930784612ef6402145e0bec095247b98 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
@@ -62,7 +62,7 @@
dir="."
executable="unzip">
<arg
- line="-o -qq wtp-wst-tests-feature*.zip -d ${install}" />
+ line="-o -qq wtp-incubator-xsl-tests-*.zip -d ${install}" />
</exec>
</target>
@@ -110,10 +110,10 @@
<antcall target="runtests">
<param
name="testPlugin"
- value="${org.eclipse.wst.xsl.launching.tests}" />
+ value="${org.eclipse.wst.xsl.tests}" />
<param
name="report"
- value="org.eclipse.wst.xsl.launching.tests" />
+ value="org.eclipse.wst.xsl.tests" />
</antcall>
</target>
@@ -151,12 +151,12 @@
<echo
level="info"
- message="Starting wst-server-tests" />
+ message="Starting xsl-tests" />
<antcall target="xsl-tests" />
<echo
level="info"
- message="Ended WTP Unit Tests" />
+ message="Ended Unit Tests" />
</target>