From e942a94bc351318ebc368bbfe7dd1bbeb41909c9 Mon Sep 17 00:00:00 2001
From: jeffliu <jeffliu>
Date: Tue, 29 Nov 2005 17:34:57 +0000
Subject: [PATCH] [118254] css.ui.tests and dtd.ui.tests are missing from the
test.properties file
---
.../distribution/wtp.api/build.xml | 21 +++++++++++++++++--
.../templateFiles/index.html.template | 2 ++
.../wtp.tests/testScripts/test.xml | 16 ++++++++++++++
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index 4cb16d5b2..d50f3ed73 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -10,6 +10,7 @@
baseos
basews
basearch
+ build.committers [optional]
releng.tag [optional]
wtp.dir [optional]
-->
@@ -116,6 +117,9 @@
<target name="getWTP">
<property name="wtp.dir" value="${local.cache.dir}"/>
<available file="${wtp.dir}/${file}" property="file.exists"/>
+ <condition property="file.url" value="http://download.eclipse.org/webtools/committers/drops/${buildType}-${buildId}-${timestamp}" else="http://download.eclipse.org/webtools/downloads/drops/${buildType}-${buildId}-${timestamp}">
+ <isset property="build.committers"/>
+ </condition>
<antcall target="getWTP2"/>
</target>
@@ -125,7 +129,6 @@
<get dest="${wtp.dir}/${file}" src="${file.url}/${file}"/>
</target>
-
<target name="setupPIAgent.linux" if="isLinux">
<unzip src="${local.cache.dir}/${tptp.file.linux-gtk-x86}" dest="${apiRoot}/piagent">
<patternset>
@@ -172,10 +175,18 @@
<param name="classname" value="org.eclipse.wtp.releng.tools.component.violation.APIViolationScanner"/>
<param name="args" value="-src ${local.cache.dir}/wtp-sdk-${buildId}.zip -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-jem -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* -debug"/>
</antcall>
+ <antcall target="runJavaMain">
+ <param name="classname" value="org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI"/>
+ <param name="args" value="-src ${local.cache.dir}/wtp-sdk-${buildId}.zip -api ${local.cache.dir}/wtp-sdk-${buildId}.zip -outputDir ${apiRoot}/apiresults -html"/>
+ </antcall>
<antcall target="runEclipseApp">
<param name="application" value="org.eclipse.wtp.releng.tools.component.core.JavadocScanner"/>
<param name="vmargs" value="-Dsrc=${local.cache.dir}/wtp-sdk-${buildId}.zip -DoutputDir=${apiRoot}/apiresults -Dapi=${local.cache.dir}/wtp-sdk-${buildId}.zip -Dexcludes=.*internal.* -Dhtml"/>
</antcall>
+ <antcall target="runJavaMain">
+ <param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.NonAPIDependencyScanner"/>
+ <param name="args" value="-src ${local.cache.dir}/wtp-sdk-${buildId}.zip -api ${local.cache.dir}/wtp-sdk-${buildId}.zip -outputDir ${apiRoot}/apiresults -refapi ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-jem -includes org.eclipse.* -skipAPIGen"/>
+ </antcall>
<mkdir dir="${apiRoot}/results/consolelogs"/>
<copy todir="${apiRoot}" overwrite="true">
<fileset dir="${build.home}/releng.wtpbuilder/distribution/wtp.tests/testScripts"/>
@@ -187,7 +198,11 @@
</ant>
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.tptp.CodeCoverageScanner"/>
- <param name="args" value="-api ${local.cache.dir}/wtp-sdk-${buildId}.zip -src ${local.cache.dir}/wtp-sdk-${buildId}.zip -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults -skipAPIGen -html"/>
+ <param name="args" value="-api ${local.cache.dir}/wtp-sdk-${buildId}.zip -src ${local.cache.dir}/wtp-sdk-${buildId}.zip ${local.cache.dir}/wtp-wst-Automated-Tests-${buildId}.zip ${local.cache.dir}/wtp-jst-Automated-Tests-${buildId}.zip -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults -skipAPIGen -html"/>
+ </antcall>
+ <antcall target="runJavaMain">
+ <param name="classname" value="org.eclipse.wtp.releng.tools.component.api.progress.APIProgressScanner"/>
+ <param name="args" value="-api ${local.cache.dir}/wtp-sdk-${buildId}.zip -src ${local.cache.dir}/wtp-sdk-${buildId}.zip -outputDir ${apiRoot}/apiresults -progressDir ${apiRoot}/apiresults/api-progress -timestamp ${timestamp} -excludes .*infopop .*doc.isv .*doc.user .*source"/>
</antcall>
</target>
@@ -213,6 +228,8 @@
<fileset dir="${apiRoot}/eclipse/plugins">
<include name="**/org.eclipse.jdt.core*.jar"/>
<include name="**/org.eclipse.core.runtime*.jar"/>
+ <include name="**/org.eclipse.core.resources*.jar"/>
+ <include name="**/org.eclipse.text*.jar"/>
<include name="**/org.eclipse.wtp.releng.tools.component.core*.jar"/>
</fileset>
</classpath>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index 71a437538..d2e2af806 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -39,7 +39,9 @@ echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/
if (file_exists("./apiresults"))
{
echo "<br>";
+ echo "<br> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
echo "<br> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
+ echo "<br> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
echo "<br> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
echo "<br> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
}
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 2bcf2d1bb..ec7db7eac 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -360,9 +360,18 @@
</antcall>
</target>
+ <!-- DTD Tests -->
+ <target name="wst-dtd-tests">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.dtd.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.dtd.ui.tests" />
+ </antcall>
+ </target>
+
<!-- CSS TESTS -->
<target name="wst-css-tests" description="Runs test.xml for
org.eclipse.wst.css.core.tests
+ org.eclipse.wst.css.ui.tests
org.eclipse.wst.css.tests.encoding">
<antcall target="runtests">
<param name="testPlugin" value="${org.eclipse.wst.css.core.tests}" />
@@ -372,6 +381,10 @@
<param name="testPlugin" value="${org.eclipse.wst.css.tests.encoding}" />
<param name="report" value="org.eclipse.wst.css.tests.encoding" />
</antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.css.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.css.ui.tests" />
+ </antcall>
</target>
<target name="wst-css-perfTests" description="Runs test.xml for
@@ -477,6 +490,9 @@
<echo message="Starting wst-html-tests"/>
<antcall target="wst-html-tests" />
+ <echo message="Starting wst-dtd-tests"/>
+ <antcall target="wst-dtd-tests" />
+
<echo message="Starting wst-css-tests"/>
<antcall target="wst-css-tests" />
--
GitLab