Skip to content
Snippets Groups Projects
Commit efe2825b authored by david_williams's avatar david_williams
Browse files

294564 refactoring needed to have truly independent JSDT build

parent b5addac8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 85 additions and 290 deletions
releng.wtpbuilder/buildtemplates/build.xml
+ 1
− 3
View file @ efe2825b
......@@ -142,9 +142,7 @@
<replacefilter
token="@longdescription@"
property="longdescription"/>
<replacefilter
token="@testplugin@"
property="testplugin"/>
<replacefilter
token="@featuresuffix@"
value="${featuresuffix}"/>
......
releng.wtpbuilder/buildtemplates/dali.properties
+ 0
− 3
View file @ efe2825b
......@@ -33,9 +33,6 @@ basicprereq=wtp
# longdescription appears on the download webpage
longdescription=The Zip file contains productized Dali Developer Tools
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.jpt.core.tests
featuresuffix=.assembly.feature
# special case
......
releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+ 6
− 2
View file @ efe2825b
......@@ -725,8 +725,12 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<tr>
<td><a href="buildNotes.php">Build notes</a> <br />
<tr><td>
<!--
Its silly to always display 'Build notes', but hard to
compute if required or not.
<a href="buildNotes.php">Build notes</a> <br />
-->
<a href="directory.txt">map files</a> <br />
<?php
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
+ 18
− 54
View file @ efe2825b
......@@ -61,66 +61,26 @@
<property
file="${testRoot}/test2.properties"/>
</target>
<target
name="runtests"
description="Runs ant on the test.xml for a specified plugin.">
<available
file="${eclipse-home}/plugins/${testPlugin}/test.xml"
property="test.xml.exists"/>
<antcall
target="runtests2"/>
</target>
<target
name="runtests2"
if="test.xml.exists">
<antcall
target="runtests-normal"/>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="runtests-normal">
<ant
antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
dir="${eclipse-home}">
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
</ant>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="@shortname@-tests"
depends="init">
<antcall
target="runtests">
<param
name="testPlugin"
value="${@testplugin@}"/>
<param
name="report"
value="@testplugin@"/>
</antcall>
<subant
target="">
<property
name="eclipse-home"
value="${testRoot}${dropinsFolder}/eclipse/"/>
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
<fileset
dir="${eclipse-home}/plugins/"
includes="**/test.xml"/>
</subant>
</target>
<!-- releng Tests -->
<!--
<target name="releng-tests" depends="init" description="Runs the
releng tests."> <antcall target="runtests"> <param
name="testPlugin" value="${org.eclipse.wtp.releng.tests}" />
<param name="report" value="org.eclipse.wtp.releng.tests" />
</antcall> </target>
-->
<target
name="all"
depends="init">
......@@ -139,6 +99,10 @@
<echo
level="info"
message="Ended Unit Tests"/>
<!-- <antcall
target="genHtml"/> -->
</target>
<target
name="genHtml"
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+ 4
− 30
View file @ efe2825b
......@@ -15,16 +15,7 @@
file="${keyCfgFile}"/>
<target
name="init">
<!--
Parameters: (Mandatory) data-dir - the workspace directory
for Eclipse to write its data plugin-name - symboic name of
the plugin to test testPlugin - 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"
value="${testRoot}/results"/>
......@@ -51,9 +42,7 @@
<property
name="junit-report-output"
value="${junit-report-output}"/>
<property
name="plugin-path"
value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
......@@ -72,9 +61,7 @@
<echo
level="debug"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
message="testPlugin: ${testPlugin}"/>
<echo
level="debug"
message="classname: ${classname}"/>
......@@ -276,21 +263,8 @@
basedir="${junit-report-output}"
includes="${classname}.xml"
destdir="${junit-report-output}/html"/>
<copy
file="${data-dir}/.metadata/.log"
toFile="${testRoot}/results/consolelogs/metadata-logs/${classname}.workspace.log"
overwrite="true"
failonError="false"/>
<!--
todo: this, especially, should be concat (there could be
more than one, in theory)
-->
<copy
file="${testRoot}/eclipse/configuration/*.log"
toFile="${testRoot}/results/consolelogs/configuration-logs/${classname}.config.log"
overwrite="true"
failonError="false"/>
</target>
<target
name="collect">
<!--
......
releng.wtpbuilder/buildtemplates/jaxws.properties
+ 0
− 3
View file @ efe2825b
......@@ -36,6 +36,3 @@ prereq.wtp=true
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.jst.ws.cxf.tests
releng.wtpbuilder/buildtemplates/jsdt.properties
+ 0
− 2
View file @ efe2825b
......@@ -31,8 +31,6 @@ prereq.eclipseplatform=true
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for the JavaScript Development Tools (JSDT).
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.wst.jsdt.core.tests.model
# omit (or set to true) for incubating projects for proper webpage
incubating=false
\ No newline at end of file
releng.wtpbuilder/buildtemplates/pave.properties
+ 0
− 3
View file @ efe2825b
......@@ -37,6 +37,3 @@ prereq.wtp=true
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for the WTP Incubator Pave Framework and reference implementation for Java EE patterns: CRUD, and CRUD Application.
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.pave.test
releng.wtpbuilder/buildtemplates/servadapt.properties
+ 0
− 2
View file @ efe2825b
......@@ -31,8 +31,6 @@ basicprereq=wtp
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for some Server Adapters.
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.jst.server.tomcat.core.tests
# special case
sdksuffix=.sdk.feature
......
releng.wtpbuilder/buildtemplates/vex.properties
+ 0
− 4
View file @ efe2825b
......@@ -33,7 +33,3 @@ prereq.wst=true
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for the WTP Incubator VEX Component.
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.wst.xml.vex.tests
releng.wtpbuilder/buildtemplates/wstfproj.properties
+ 0
− 3
View file @ efe2825b
......@@ -31,9 +31,6 @@ basicprereq=
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for non-java Faceted Projects
# testplugin is the "main" test plugin, which may "call" the others
testplugin=
# normally is '.feature', but if not, leave empty
featuresuffix=
......
releng.wtpbuilder/buildtemplates/wtpcap.properties
+ 0
− 3
View file @ efe2825b
......@@ -32,9 +32,6 @@ basicprereq=wst
# longdescription appears on the download webpage
longdescription=The Zip file contains example capability definitions
# testplugin is the "main" test plugin, which may "call" the others
testplugin=
# normally is '.feature', but if not, leave empty
featuresuffix=
......
releng.wtpbuilder/buildtemplates/wtpjee.properties
+ 0
− 3
View file @ efe2825b
......@@ -32,9 +32,6 @@ basicprereq=
# longdescription appears on the download webpage
longdescription=The Zip file contains productized Java EE Developer Tools
# testplugin is the "main" test plugin, which may "call" the others
testplugin=
# omit (or set to true) for incubating projects for proper webpage
incubating=false
\ No newline at end of file
releng.wtpbuilder/buildtemplates/xmlsec.properties
+ 0
− 3
View file @ efe2825b
......@@ -35,6 +35,3 @@ prereq.wst=true
# longdescription appears on the download webpage
longdescription=The Zip files includes the features and plugins for the WTP Incubator XML Security Component.
# testplugin is the "main" test plugin, which may "call" the others
testplugin=org.eclipse.wst.xml.security.core.tests
releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+ 6
− 2
View file @ efe2825b
......@@ -725,8 +725,12 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<tr>
<td><a href="buildNotes.php">Build notes</a> <br />
<tr><td>
<!--
Its silly to always display 'Build notes', but hard to
compute if required or not.
<a href="buildNotes.php">Build notes</a> <br />
-->
<a href="directory.txt">map files</a> <br />
<?php
......
releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
+ 18
− 54
View file @ efe2825b
......@@ -61,66 +61,26 @@
<property
file="${testRoot}/test2.properties"/>
</target>
<target
name="runtests"
description="Runs ant on the test.xml for a specified plugin.">
<available
file="${eclipse-home}/plugins/${testPlugin}/test.xml"
property="test.xml.exists"/>
<antcall
target="runtests2"/>
</target>
<target
name="runtests2"
if="test.xml.exists">
<antcall
target="runtests-normal"/>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="runtests-normal">
<ant
antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
dir="${eclipse-home}">
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
</ant>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="jaxws-tests"
depends="init">
<antcall
target="runtests">
<param
name="testPlugin"
value="${org.eclipse.jst.ws.cxf.tests}"/>
<param
name="report"
value="org.eclipse.jst.ws.cxf.tests"/>
</antcall>
<subant
target="">
<property
name="eclipse-home"
value="${testRoot}${dropinsFolder}/eclipse/"/>
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
<fileset
dir="${eclipse-home}/plugins/"
includes="**/test.xml"/>
</subant>
</target>
<!-- releng Tests -->
<!--
<target name="releng-tests" depends="init" description="Runs the
releng tests."> <antcall target="runtests"> <param
name="testPlugin" value="${org.eclipse.wtp.releng.tests}" />
<param name="report" value="org.eclipse.wtp.releng.tests" />
</antcall> </target>
-->
<target
name="all"
depends="init">
......@@ -139,6 +99,10 @@
<echo
level="info"
message="Ended Unit Tests"/>
<!-- <antcall
target="genHtml"/> -->
</target>
<target
name="genHtml"
......
releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
+ 4
− 30
View file @ efe2825b
......@@ -15,16 +15,7 @@
file="${keyCfgFile}"/>
<target
name="init">
<!--
Parameters: (Mandatory) data-dir - the workspace directory
for Eclipse to write its data plugin-name - symboic name of
the plugin to test testPlugin - 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"
value="${testRoot}/results"/>
......@@ -51,9 +42,7 @@
<property
name="junit-report-output"
value="${junit-report-output}"/>
<property
name="plugin-path"
value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
......@@ -72,9 +61,7 @@
<echo
level="debug"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
message="testPlugin: ${testPlugin}"/>
<echo
level="debug"
message="classname: ${classname}"/>
......@@ -276,21 +263,8 @@
basedir="${junit-report-output}"
includes="${classname}.xml"
destdir="${junit-report-output}/html"/>
<copy
file="${data-dir}/.metadata/.log"
toFile="${testRoot}/results/consolelogs/metadata-logs/${classname}.workspace.log"
overwrite="true"
failonError="false"/>
<!--
todo: this, especially, should be concat (there could be
more than one, in theory)
-->
<copy
file="${testRoot}/eclipse/configuration/*.log"
toFile="${testRoot}/results/consolelogs/configuration-logs/${classname}.config.log"
overwrite="true"
failonError="false"/>
</target>
<target
name="collect">
<!--
......
releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+ 6
− 2
View file @ efe2825b
......@@ -725,8 +725,12 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<tr>
<td><a href="buildNotes.php">Build notes</a> <br />
<tr><td>
<!--
Its silly to always display 'Build notes', but hard to
compute if required or not.
<a href="buildNotes.php">Build notes</a> <br />
-->
<a href="directory.txt">map files</a> <br />
<?php
......
releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
+ 18
− 54
View file @ efe2825b
......@@ -61,66 +61,26 @@
<property
file="${testRoot}/test2.properties"/>
</target>
<target
name="runtests"
description="Runs ant on the test.xml for a specified plugin.">
<available
file="${eclipse-home}/plugins/${testPlugin}/test.xml"
property="test.xml.exists"/>
<antcall
target="runtests2"/>
</target>
<target
name="runtests2"
if="test.xml.exists">
<antcall
target="runtests-normal"/>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="runtests-normal">
<ant
antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
dir="${eclipse-home}">
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
</ant>
<copy
file="${eclipse-home}/${report}.xml"
tofile="${results}/xml/${report}_${platform}.xml"
failonerror="false"/>
<antcall
target="genHtml"/>
</target>
<target
name="jsdt-tests"
depends="init">
<antcall
target="runtests">
<param
name="testPlugin"
value="${org.eclipse.wst.jsdt.core.tests.model}"/>
<param
name="report"
value="org.eclipse.wst.jsdt.core.tests.model"/>
</antcall>
<subant
target="">
<property
name="eclipse-home"
value="${testRoot}${dropinsFolder}/eclipse/"/>
<property
name="library-file"
value="${testRoot}/wtp-junit-tests.xml"/>
<fileset
dir="${eclipse-home}/plugins/"
includes="**/test.xml"/>
</subant>
</target>
<!-- releng Tests -->
<!--
<target name="releng-tests" depends="init" description="Runs the
releng tests."> <antcall target="runtests"> <param
name="testPlugin" value="${org.eclipse.wtp.releng.tests}" />
<param name="report" value="org.eclipse.wtp.releng.tests" />
</antcall> </target>
-->
<target
name="all"
depends="init">
......@@ -139,6 +99,10 @@
<echo
level="info"
message="Ended Unit Tests"/>
<!-- <antcall
target="genHtml"/> -->
</target>
<target
name="genHtml"
......
releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+ 4
− 30
View file @ efe2825b
......@@ -15,16 +15,7 @@
file="${keyCfgFile}"/>
<target
name="init">
<!--
Parameters: (Mandatory) data-dir - the workspace directory
for Eclipse to write its data plugin-name - symboic name of
the plugin to test testPlugin - 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"
value="${testRoot}/results"/>
......@@ -51,9 +42,7 @@
<property
name="junit-report-output"
value="${junit-report-output}"/>
<property
name="plugin-path"
value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
......@@ -72,9 +61,7 @@
<echo
level="debug"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
message="testPlugin: ${testPlugin}"/>
<echo
level="debug"
message="classname: ${classname}"/>
......@@ -276,21 +263,8 @@
basedir="${junit-report-output}"
includes="${classname}.xml"
destdir="${junit-report-output}/html"/>
<copy
file="${data-dir}/.metadata/.log"
toFile="${testRoot}/results/consolelogs/metadata-logs/${classname}.workspace.log"
overwrite="true"
failonError="false"/>
<!--
todo: this, especially, should be concat (there could be
more than one, in theory)
-->
<copy
file="${testRoot}/eclipse/configuration/*.log"
toFile="${testRoot}/results/consolelogs/configuration-logs/${classname}.config.log"
overwrite="true"
failonError="false"/>
</target>
<target
name="collect">
<!--
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent