post M5 test infrastructure
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 9a3ebfd..ce66c08 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -58,12 +58,7 @@
<property name="indexTemplateFilename" value="index.html.template" />
<condition property="isBuildTested" value="true">
- <available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
- </condition>
- <condition property="isBuildTested" value="false">
- <not>
- <available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
- </not>
+ <available file="${buildDirectory}/${buildLabel}/testResults/html" />
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index f203ccc..5f35bb2 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -1,190 +1,208 @@
-<project
- name="Build specific targets and properties"
- default="test">
+<project name="Build specific targets and properties" default="test">
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
- <!-- ===================================================================== -->
- <!-- Steps to do after the build is done. -->
- <!-- ===================================================================== -->
- <target name="test">
- <antcall target="runTest" />
- </target>
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the build is done. -->
+ <!-- ===================================================================== -->
+ <target name="test">
+ <antcall target="runTest" />
+ </target>
- <!-- ===================================================================== -->
- <!-- Steps to do to test the build results -->
- <!-- ===================================================================== -->
- <target name="runTest">
+ <!-- ===================================================================== -->
+ <!-- Steps to do to test the build results -->
+ <!-- ===================================================================== -->
+ <target name="runTest">
- <dirname
- file="${ant.file}"
- property="test.component.dir" />
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
- <property file="${wtp.builder.home}/build.properties" />
-
- <mkdir dir="${testRoot}" />
- <mkdir dir="${testRoot}/results" />
- <mkdir dir="${testRoot}/results/consolelogs" />
-
- <copy
- todir="${testRoot}"
- overwrite="true">
- <fileset dir="${test.component.dir}/testScripts"></fileset>
- </copy>
-
- <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
-
- <ant
- antfile="${test.component.dir}/testdependency.xml"
- target="get">
- <property
- name="dependency.properties"
- value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <property
- name="base.install.dir"
- value="${testRoot}" />
- </ant>
-
- <antcall target="unzipTests" />
-
- <antcall target="runTestEclipse">
- <param
- name="testTarget"
- value="all" />
- </antcall>
- <antcall target="postRunTestEclipse">
- <param
- name="testTarget"
- value="all" />
- </antcall>
-
- </target>
-
- <target name="unzipTests">
-
- <!--unzip the builds and junit tests
- 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-sdk-${buildLabel}.zip -d ${testRoot}" />
- </exec>
-
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
- </exec>
+ <dirname file="${ant.file}" property="test.component.dir" />
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <property file="${buildDirectory}/label.properties" />
+ <property file="${wtp.builder.home}/build.properties" />
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jsf-sdk-${buildLabel}.zip -d ${testRoot}" />
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jsf-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
- </exec>
+ <mkdir dir="${testRoot}" />
+
+ <!-- if results already exist, delete them -->
+ <delete dir="${testRoot}/results" failOnError="false"/>
+ <mkdir dir="${testRoot}/results" />
+ <mkdir dir="${testRoot}/results/consolelogs" />
+ <mkdir dir="${testRoot}/results/consolelogs/metadata-logs" />
+ <mkdir dir="${testRoot}/results/consolelogs/configuration-logs" />
+
+ <copy todir="${testRoot}" overwrite="true">
+ <fileset dir="${test.component.dir}/testScripts"></fileset>
+ </copy>
+
+ <echo
+ message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
+
+ <ant antfile="${test.component.dir}/testdependency.xml"
+ target="get">
+ <property name="dependency.properties"
+ value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property name="base.install.dir" value="${testRoot}" />
+ </ant>
+
+ <antcall target="unzipTests" />
+
+ <antcall target="runTestEclipse">
+ <param name="testTarget" value="all" />
+ </antcall>
+ <antcall target="postRunTestEclipse">
+ <param name="testTarget" value="all" />
+ </antcall>
+
+ </target>
+
+ <target name="unzipTests">
+
+ <!--unzip the builds and junit tests
+ 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-sdk-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg
+ line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg
+ line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jpa-${buildLabel}.zip -d ${testRoot}" />
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
- </exec>
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg
+ line="-o -qq wtp-jsf-sdk-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg
+ line="-o -qq wtp-jsf-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
- </target>
- <!-- time out may need to be set/adjust for api or performance tests?
- some common values:
- 7200000: 2 hours
- 3600000: 1 hour
- 1800000: 30 minutes
- 600000: 10 minutes
- -->
- <property
- name="testTimeLimit"
- value="3600000" />
- <property
- name="testFailOnError"
- value="false" />
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jpa-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
+ failonerror="false">
+ <arg
+ line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
- <target name="runTestEclipse" description="Run our JUnit's within an instance of antRunner" >
+ </target>
+
+ <!-- time out may need to be set/adjust for api or performance tests?
+ This testTimeLimit is the whole, overall limit on tests. There's a shorter
+ one for individual suites.
+
+ some common values, of milliseconds to more recognizable units:
+ 7200000: 2 hours
+ 3600000: 1 hour
+ 1800000: 30 minutes
+ 600000: 10 minutes
+ -->
+
+ <property name="testTimeLimit" value="7200000" />
+ <property name="testFailOnError" value="false" />
+
+ <target name="runTestEclipse"
+ description="Run our JUnit's within an instance of antRunner">
- <property name="vmargs" value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId}"/>
+ <property name="vmargs"
+ value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId}" />
- <property name="test-vm" value="${env.JAVA_5_HOME}/bin/java" />
+ <property name="test-vm" value="${env.JAVA_5_HOME}/bin/java" />
- <!--ensure executable has execute permission-->
- <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx"/>
+ <!--ensure executable has execute permission-->
+ <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx" />
+
+ <echo message="Running junits" />
- <echo message="Running junits" />
+ <exec executable="${testRoot}/eclipse/eclipse"
+ dir="${testRoot}/eclipse" timeout="${testTimeLimit}">
+ <arg line="-nosplash" />
+ <arg line="-suppressErrors" />
+ <arg line="-debug" />
+ <arg line="-consoleLog" />
+ <arg line="-data ./antRunnerWorkspace" />
+ <arg line="-vm ${test-vm}" />
+ <arg line="-application org.eclipse.ant.core.antRunner" />
+ <arg
+ line="-propertyfile ${test.component.dir}/testScripts/test.properties" />
+ <arg line="-logger org.apache.tools.ant.DefaultLogger" />
+ <arg
+ line="-file ${test.component.dir}/testScripts/test.xml all" />
+ <arg line="-DtestRoot=${testRoot}" />
+ <arg line="-DtestDir=${testRoot}" />
+ <arg line="-DbuildDirectory=${buildDirectory}" />
+ <arg line="-Dbuild.home=${env.BUILD_HOME}" />
+ <arg line="-Dperf.buildId=${buildType}${date}-${time}" />
+ <arg line="-DeclipseBuilderDirectory=${pde.builder.path}" />
+ <arg line="-DbuildLabel=${buildLabel}" />
+ <arg line="-vmargs ${vmargs}" />
+ <env key="DISPLAY" value="${env.DISPLAY}" />
+ <redirector output="${testRoot}/results/fullOutput.txt"
+ error="${testRoot}/results/fullErrorLog.txt" />
- <exec executable="${testRoot}/eclipse/eclipse" dir="${testRoot}/eclipse" timeout="${testTimeLimit}" >
- <arg line="-nosplash"/>
- <arg line="-suppressErrors"/>
- <arg line="-debug"/>
- <arg line="-consoleLog"/>
- <arg line="-data ./antRunnerWorkspace"/>
- <arg line="-vm ${test-vm}"/>
- <arg line="-application org.eclipse.ant.core.antRunner"/>
- <arg line="-propertyfile ${test.component.dir}/testScripts/test.properties" />
- <arg line="-logger org.apache.tools.ant.DefaultLogger" />
- <arg line="-file ${test.component.dir}/testScripts/test.xml all"/>
- <arg line="-DtestRoot=${testRoot}" />
- <arg line="-DtestDir=${testRoot}" />
- <arg line="-DbuildDirectory=${buildDirectory}" />
- <arg line="-Dbuild.home=${env.BUILD_HOME}" />
- <arg line="-Dperf.buildId=${buildType}${date}-${time}" />
- <arg line="-DeclipseBuilderDirectory=${pde.builder.path}" />
- <arg line="-DbuildLabel=${buildLabel}" />
- <arg line="-vmargs ${vmargs}"/>
- <env key="DISPLAY" value="${env.DISPLAY}" />
- <redirector output="./antRunnerExecOutput.txt" error="./antRunnerExecErrorOutput.txt"/>
+ </exec>
- </exec>
+ </target>
- </target>
+ <target name="postRunTestEclipse">
+ <copy
+ todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
+ overwrite="true">
+ <fileset dir="${testRoot}/results">
+ <include name="**/*output.txt" />
+ </fileset>
+ </copy>
+ <copy
+ todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
+ overwrite="true">
+ <fileset dir="${testRoot}/results">
+ <include name="**/*error.txt" />
+ </fileset>
+ </copy>
+ <copy file="${testRoot}/results/fullOutput.txt"
+ toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+ overwrite="true">
+ </copy>
+ <copy file="${testRoot}/results/fullErrorLog.txt"
+ toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+ overwrite="true">
+ </copy>
- <target name="postRunTestEclipse">
- <copy
- todir="${buildDirectory}/${buildLabel}/testResults"
- overwrite="true">
- <fileset dir="${testRoot}/results">
- <include name="**/*.*" />
- </fileset>
- </copy>
- </target>
+ <copy todir="${buildDirectory}/${buildLabel}/testResults/xml"
+ overwrite="true">
+ <fileset dir="${testRoot}/results/xml">
+ <include name="*.xml" />
+ </fileset>
+ </copy>
+ <copy todir="${buildDirectory}/${buildLabel}/testResults/html"
+ overwrite="true">
+ <fileset dir="${testRoot}/results/html">
+ <include name="*.html" />
+ </fileset>
+ </copy>
+ </target>
</project>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
index d76115a..ac9a213 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
@@ -1,102 +1,85 @@
<?xml version="1.0"?>
<project name="JUnit tests" basedir=".">
- <property environment="env" />
- <!-- basedir should be "eclipse-home", the eclipse install being tested -->
+ <property environment="env" />
- <property name="library-xml-file"
- value="${testRoot}/library.xml" />
- <!-- value="${basedir}/plugins/org.eclipse.test_3.1.0/library.xml" /> -->
+ <property name="library-xml-file" value="${testRoot}/library.xml" />
+
+ <import file="${library-xml-file}" />
+
+ <target name="init">
+ <!--
+ Parameters:
+ (Mandatory)
+ data-dir - the directory for Eclipse to write its data
+ plugin-name - the name of the plugin to test
+ classname - the name of the test class
+
+ (Optional - overrides defaults set in script)
+ vmargs - a string containing arguments to pass to the VM.
+ extraVMargs - allows separate setting of VM args from separate caller.
+ timeout - overrides default test timeout value (in milliseconds).
+ test-output - overrides default output file produced from test run.
+ plugin-path - path to root of plug-in
+ useEclipseExe - property setting forces test to launch via eclipse executable.
+ junit-report-output - output directory for junit reports produced for specified classname.
+ -->
+
+ <property name="junit-report-output" value="${testRoot}/results" />
- <import file="${library-xml-file}" />
+
+ <mkdir dir="${junit-report-output}/raw" />
+
+ <property name="otherVMArgs" value=" -Dwtp.autotest.noninteractive=true -Dosgi.clean=true -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH}" />
+
+ <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
+ <property name="extraVMargs" value="" />
+
+ <property name="testRoot" value="${testRoot}" />
+ <property name="extraVMargs" value="${extraVMargs} ${otherVMArgs}" />
+ <property name="timeout" value="600000" />
+ <property name="junit-report-output" value="${junit-report-output}" />
+ <property name="plugin-path" value="${basedir}/plugins/${testPlugin}" />
+ <property name="formatter" value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
+ <property name="test-output" value="${junit-report-output}/raw/${classname}.xml" />
+ <property name="useEclispeExe" value="true" />
+ <property name="classname" value="${classname}" />
+ <property name="jvm" value="${env.JAVA_5_HOME}/bin/java" />
- <property name="junit-report-output"
- value="${testRoot}/results" />
- <property name="otherVMArgs"
- value=" -Dwtp.autotest.noninteractive=true -Dosgi.clean=true -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH}" />
+ <echo message="basedir: ${basedir}" />
+ <echo message="eclipse-home: ${eclipse-home}" />
+ <echo message="testRoot: ${testRoot}" />
+ <echo message="class-name: ${classname}" />
+ <echo message="plugin-name: ${plugin-name}" />
+ <echo message="plugin-direcotory: ${testPlugin}" />
+ <echo message="library-xml-file: ${library-xml-file}" />
+ <echo message="junit-report-output: ${junit-report-output}" />
+ <echo message="test-output: ${test-output}" />
- <target name="core-test">
- <echo message="test-type: core-test" />
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="testRoot: ${testRoot}" />
- <echo message="class-name: ${classname}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="plugin-direcotory: ${testPlugin}" />
- <echo message="library-xml-file: ${library-xml-file}" />
- <echo message="junit-report-output: ${junit-report-output}" />
- <echo message="test-output: ${junit-report-output}/${classname}.xml" />
-
- <echo message="jvm: ${env.JAVA_5_HOME}/bin/java" />
- <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
- <property name="extraVMargs" value="" />
-
- <mkdir dir="${junit-report-output}" />
-
- <ant antfile="${library-xml-file}"
- target="eclipse-test">
- <property name="application"
- value="org.eclipse.test.coretestapplication" />
- <property name="testRoot" value="${testRoot}" />
- <property name="extraVMargs"
- value="${extraVMargs} ${otherVMArgs}" />
- <property name="timeout" value="600000" />
- <property name="junit-report-output"
- value="${junit-report-output}" />
- <property name="plugin-path"
- value="${basedir}/plugins/${testPlugin}" />
- <property name="formatter"
- value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
- <property name="test-output"
- value="${junit-report-output}/${classname}.xml" />
- <property name="useEclispeExe" value="true" />
- <property name="classname" value="${classname}" />
- <property name="jvm" value="${env.JAVA_5_HOME}/bin/java" />
- </ant>
- </target>
+ <echo message="jvm: ${env.JAVA_5_HOME}/bin/java" />
- <target name="ui-test">
- <echo message="test-type: ui-test" />
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="testRoot: ${testRoot}" />
- <echo message="class-name: ${classname}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="plugin-direcotory: ${testPlugin}" />
- <echo message="library-xml-file: ${library-xml-file}" />
- <echo message="junit-report-output: ${junit-report-output}" />
- <echo message="jvm: ${env.JAVA_5_HOME}/bin/java" />
- <echo message="test-output: ${junit-report-output}/${classname}.xml" />
- <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
- <property name="extraVMargs" value="" />
- <mkdir dir="${junit-report-output}" />
+ </target>
- <ant antfile="${library-xml-file}"
- target="eclipse-test">
- <property name="application"
- value="org.eclipse.test.uitestapplication" />
- <property name="testRoot" value="${testRoot}" />
- <property name="extraVMargs"
- value="${extraVMargs} ${otherVMArgs}" />
- <property name="timeout" value="600000" />
- <property name="junit-report-output"
- value="${junit-report-output}" />
- <property name="plugin-path"
- value="${basedir}/plugins/${testPlugin}" />
- <property name="formatter"
- value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
- <property name="test-output"
- value="${junit-report-output}/${classname}.xml" />
- <property name="useEclispeExe" value="true" />
- <property name="classname" value="${classname}" />
- <property name="jvm" value="${env.JAVA_5_HOME}/bin/java" />
- </ant>
- </target>
+
+
+ <target name="core-test" depends="init">
+ <echo message="test-type: core-test" />
+ <ant antfile="${library-xml-file}" target="eclipse-test">
+ <property name="application" value="org.eclipse.test.coretestapplication" />
+ </ant>
+ </target>
+
+
+ <target name="ui-test" depends="init">
+ <echo message="test-type: ui-test" />
+ <ant antfile="${library-xml-file}" target="eclipse-test">
+ <property name="application" value="org.eclipse.test.uitestapplication" />
+ </ant>
+ </target>
</project>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/library.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/library.xml
index 80b2666..77178b7 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/library.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/library.xml
@@ -1,132 +1,98 @@
<?xml version="1.0"?>
<project name="Library" default="usage" basedir=".">
- <property environment="env" />
+ <property environment="env" />
- <target name="usage">
- <echo message="Please refer to the testframework.html in org.eclipse.test for instructions on usage." />
- </target>
+ <target name="usage">
+ <echo
+ message="Please refer to the testframework.html in org.eclipse.test for instructions on usage." />
+ </target>
- <target name="init">
- <!--
- Parameters:
- (Mandatory)
- data-dir - the directory for Eclipse to write its data
- plugin-name - the name of the plugin to test
- classname - the name of the test class
+ <target name="eclipse-test"
+ description="Runs the specified classname as a plug-in test.">
+ <property name="vmargs" value="-Xms256m -Xmx512m" />
- (Optional - overrides defaults set in script)
- vmargs - a string containing arguments to pass to the VM.
- extraVMargs - allows separate setting of VM args from separate caller.
- timeout - overrides default test timeout value (in milliseconds).
- test-output - overrides default output file produced from test run.
- plugin-path - path to root of plug-in
- useEclipseExe - property setting forces test to launch via eclipse executable.
- junit-report-output - output directory for junit reports produced for specified classname.
- -->
+ <!--use -consolelog if launching a headless test-->
+ <condition property="consolelog" value="-consolelog">
+ <equals arg1="${application}"
+ arg2="org.eclipse.test.coretestapplication" />
+ </condition>
+ <property name="consolelog" value="" />
- <tstamp>
- <format property="TIMENOW" pattern="HHmmssSSSS"/>
- </tstamp>
- <!--property setting useEclipseExe launches tests using the eclipse executable-->
- <condition property="launchTarget" value="eclipse-test">
- <isset property="useEclipseExe" />
- </condition>
- <!--default launch target for launching tests-->
- <property name="launchTarget" value="java-test" />
- <property name="formatter" value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
- <!--default heap sizes when running performance tests-->
- <condition property="vmargs" value=" -Xms256M -Xmx256M">
- <equals arg1="${test.target}" arg2="performance" />
- </condition>
- <property name="extraVMargs" value=""/>
- <property name="plugin-path" value="" />
- <property name="timeout" value="7200000" />
- <property name="test-output" value="${testRoot}/results/${classname}.xml" />
- <property name="junit-report-output" value="${testRoot}/results" />
- <mkdir dir="${junit-report-output}"/>
- </target>
+ <!--
+ vm selection priority:
+ 1. user-specified java executable via outer Ant property setting of "jvm".
+ 2. java executable on path.
+ -->
+ <condition property="test-vm" value="-vm ${jvm}">
+ <isset property="jvm" />
+ </condition>
+ <property name="test-vm" value="" />
-
- <target name="eclipse-test" description="Runs the specified classname as a plug-in test.">
- <property name="vmargs" value="-Xms256m -Xmx512m"/>
-
- <!--use -consolelog if launching a headless test-->
- <condition property="consolelog" value="-consolelog">
- <equals arg1="${application}" arg2="org.eclipse.test.coretestapplication"/>
- </condition>
- <property name="consolelog" value="" />
-
- <!--
- vm selection priority:
- 1. user-specified java executable via outer Ant property setting of "jvm".
- 2. java executable on path.
- -->
- <condition property="test-vm" value="-vm ${jvm}">
- <isset property="jvm" />
- </condition>
- <property name="test-vm" value="" />
-
- <!--ensure executable has execute permission-->
- <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx"/>
+ <!--ensure executable has execute permission-->
+ <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx" />
- <echo message="Running ${classname}" />
- <echo message="Result file: ${junit-report-output}/${classname}.xml."/>
- <echo message="DISPLAY: ${env.DISPLAY}" />
- <exec executable="${testRoot}/eclipse/eclipse" dir="${testRoot}/eclipse" timeout="${timeout}" logError="true" failonerror="false" >
- <arg line="-data ${data-dir}"/>
- <arg line="${test-vm}"/>
- <arg line="-application ${application}"/>
- <arg line="formatter=${formatter},${test-output}"/>
- <arg line="-testPluginName ${plugin-name}"/>
- <arg line="-className ${classname}"/>
- <arg line="-nosplash"/>
- <arg line="-suppressErrors"/>
- <arg line="${consolelog}"/>
- <arg line="-vmargs ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}"/>
- <env key="DISPLAY" value="${env.DISPLAY}" />
- <redirector output="${junit-report-output}/${classname}.output.txt" error="${junit-report-output}/${classname}.error.txt"/>
-
- </exec>
- <antcall target="collect-results" />
- </target>
+ <echo message="Running ${classname}" />
+ <echo
+ message="Result file: ${junit-report-output}/${classname}.xml." />
+ <echo message="DISPLAY: ${env.DISPLAY}" />
+ <exec executable="${testRoot}/eclipse/eclipse"
+ dir="${testRoot}/eclipse" timeout="${timeout}" logError="true"
+ failonerror="false">
+ <arg line="-data ${data-dir}" />
+ <arg line="${test-vm}" />
+ <arg line="-application ${application}" />
+ <arg line="formatter=${formatter},${test-output}" />
+ <arg line="-testPluginName ${plugin-name}" />
+ <arg line="-className ${classname}" />
+ <arg line="-nosplash" />
+ <arg line="-suppressErrors" />
+ <arg line="${consolelog}" />
+ <arg
+ line="-vmargs ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}" />
+ <env key="DISPLAY" value="${env.DISPLAY}" />
+ <redirector
+ output="${junit-report-output}/${classname}.output.txt"
+ error="${junit-report-output}/${classname}.error.txt" />
- <target name="collect-results">
- <dirname property="output-dir" file="${test-output}"/>
- <basename property="output-file-name" file="${test-output}"/>
- <junitreport todir="${junit-report-output}" tofile="${classname}.xml">
- <fileset dir="${output-dir}">
- <include name="${output-file-name}"/>
- </fileset>
- </junitreport>
+ </exec>
+ <antcall target="collect-results" inheritAll="true" />
+ </target>
- <style style="${testRoot}/JUNIT.XSL"
- basedir="${junit-report-output}"
- includes="${classname}.result.xml"
- destdir="${junit-report-output}" />
+ <target name="collect-results">
+ <dirname property="output-dir" file="${test-output}" />
+ <basename property="output-file-name" file="${test-output}" />
+ <mkdir dir="${junit-report-output}/xml" />
+ <junitreport todir="${junit-report-output}/xml"
+ tofile="${classname}.xml">
+ <fileset dir="${output-dir}">
+ <include name="${output-file-name}" />
+ </fileset>
+ </junitreport>
- <!--save .log content and *.log content from configuration directory-->
- <concat destfile="${junit-report-output}/${classname}.log">
- <fileset dir="${testRoot}/eclipse" includes="${data-dir}/.metadata/*.log"/>
- <fileset dir="${testRoot}/eclipse" includes="configuration/*.log"/>
- </concat>
- </target>
+ <mkdir dir="${junit-report-output}/html" />
+ <style style="${testRoot}/JUNIT.XSL"
+ basedir="${junit-report-output}" includes="${classname}.xml"
+ destdir="${junit-report-output}/html" />
- <target name="collect">
- <!--
- This target can be used to aggragate test runs from multiple test suites into a single report.
- Parameters to this target:
- includes - the names of the files to include
- output-file - the name of the output file to produce
- -->
- <junitreport todir="." tofile="${output-file}">
- <fileset dir=".">
- <include name="${includes}"/>
- </fileset>
- </junitreport>
- </target>
+ <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">
+ <!-- deprecated, each test.xml uses it, and we should remove, eventually -->
+ </target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 1947213..d290e90 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -1,512 +1,512 @@
-<project name="Automated Eclipse Testing" default="all" basedir="." >
+<project name="Automated Eclipse Testing" default="all" basedir=".">
- <echo message="starting Automated Eclipse Testing" />
- <echo message="basedir: ${basedir}" />
- <!--properties file containing the plugin directory name including version number-->
- <property file="${testRoot}/test.properties" />
+ <echo message="starting Automated Eclipse Testing" />
+ <echo message="basedir: ${basedir}" />
+ <!--properties file containing the plugin directory name including version number-->
+ <property file="${testRoot}/test.properties" />
- <!--properties file containing the build information-->
- <property file="${buildDirectory}/label.properties" />
+ <!--properties file containing the build information-->
+ <property file="${buildDirectory}/label.properties" />
- <!--default directory where test-eclipse will be installed-->
- <property name="install" value="${testRoot}" />
+ <!--default directory where test-eclipse will be installed-->
+ <property name="install" value="${testRoot}" />
- <!--name that can be added to report name to identify which platform tests results come from-->
- <property name="platform" value="" />
+ <!--name that can be added to report name to identify which platform tests results come from-->
+ <property name="platform" value="" />
- <!-- The root of the eclipse installation -->
- <property name="eclipse-home" value="${testRoot}/eclipse" />
+ <!-- The root of the eclipse installation -->
+ <property 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 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" value="${basedir}/results" />
+ <!-- The directory that will contain the xml and html results from the tests that are run -->
+ <property name="results" value="${testRoot}/results" />
- <!-- jonas install directory -->
- <property name="jonas432Dir" value="${testRoot}/${jonas432DirName}"/>
+ <!-- jonas install directory -->
+ <property name="jonas432Dir" value="${testRoot}/${jonas432DirName}" />
- <target name="init">
- <antcall target="setPropertyJOnAS432Dir"/>
- <antcall target="computePluginVersion"/>
- </target>
+ <target name="init">
+ <antcall target="setPropertyJOnAS432Dir" />
+ <antcall target="computePluginVersion" />
+ </target>
- <target name="setPropertyJOnAS432Dir" unless="jonas432Dir">
- <property name="jonas432Dir" value="${testRoot}/${jonas432DirName}"/>
- </target>
+ <target name="setPropertyJOnAS432Dir" unless="jonas432Dir">
+ <property name="jonas432Dir" value="${testRoot}/${jonas432DirName}" />
+ </target>
- <target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
- <delete dir="${install}" />
- <mkdir dir="${install}" />
- <exec dir="." executable="unzip">
- <arg line="-o -qq ../downloads/*.zip -d ${install}"/>
- </exec>
+ <target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
+ <delete dir="${install}" />
+ <mkdir dir="${install}" />
+ <exec dir="." executable="unzip">
+ <arg line="-o -qq ../downloads/*.zip -d ${install}" />
+ </exec>
- <exec dir="." executable="unzip">
- <arg line="-o -qq wtp-wst-tests-feature*.zip -d ${install}"/>
- </exec>
+ <exec dir="." executable="unzip">
+ <arg line="-o -qq wtp-wst-tests-feature*.zip -d ${install}" />
+ </exec>
- </target>
+ </target>
- <target name="runapitests" depends="setup">
- <antcall target="runtests"/>
- </target>
+ <target name="runapitests" depends="setup">
+ <antcall target="runtests" />
+ </target>
- <target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
- <available file="${eclipse-home}/plugins/${testPlugin}/test.xml" property="test.xml.exists"/>
- <antcall target="runtests2"/>
- </target>
+ <target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
+ <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="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}/junit-tests.xml"/>
- </ant>
- <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}/junit-tests.xml" />
+ </ant>
+ <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
+ <antcall target="genHtml" />
+ </target>
- <target name="wst-server-tests" description="Runs the org.eclipse.wst.server.*.tests test.xml">
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.server.core.tests}" />
- <param name="report" value="org.eclipse.wst.server.core.tests" />
- <param name="package.includes" value="org.eclipse.wst.server"/>
- </antcall>
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.server.ui.tests}" />
- <param name="report" value="org.eclipse.wst.server.ui.tests" />
- <param name="package.includes" value="org.eclipse.wst.server"/>
- </antcall>
- </target>
+ <target name="wst-server-tests" description="Runs the org.eclipse.wst.server.*.tests test.xml">
+ <antcall target="runapitests">
+ <param name="testPlugin" value="${org.eclipse.wst.server.core.tests}" />
+ <param name="report" value="org.eclipse.wst.server.core.tests" />
+ <param name="package.includes" value="org.eclipse.wst.server" />
+ </antcall>
+ <antcall target="runapitests">
+ <param name="testPlugin" value="${org.eclipse.wst.server.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.server.ui.tests" />
+ <param name="package.includes" value="org.eclipse.wst.server" />
+ </antcall>
+ </target>
- <target name="wst-monitor-tests" description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.internet.monitor.core.tests}" />
- <param name="report" value="org.eclipse.wst.internet.monitor.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.internet.monitor.ui.tests}" />
- <param name="report" value="org.eclipse.wst.internet.monitor.ui.tests" />
- </antcall>
- </target>
+ <target name="wst-monitor-tests" description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.internet.monitor.core.tests}" />
+ <param name="report" value="org.eclipse.wst.internet.monitor.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.internet.monitor.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.internet.monitor.ui.tests" />
+ </antcall>
+ </target>
- <target name="wst-cache-tests" description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.internet.cache.tests}" />
- <param name="report" value="org.eclipse.wst.internet.cache.tests" />
- </antcall>
- </target>
+ <target name="wst-cache-tests" description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.internet.cache.tests}" />
+ <param name="report" value="org.eclipse.wst.internet.cache.tests" />
+ </antcall>
+ </target>
- <target name="jst-server-tests" description="Runs the org.eclipse.jst.server.*.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.core.tests}" />
- <param name="report" value="org.eclipse.jst.server.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.ui.tests}" />
- <param name="report" value="org.eclipse.jst.server.ui.tests" />
- </antcall>
- </target>
+ <target name="jst-server-tests" description="Runs the org.eclipse.jst.server.*.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.core.tests}" />
+ <param name="report" value="org.eclipse.jst.server.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.ui.tests}" />
+ <param name="report" value="org.eclipse.jst.server.ui.tests" />
+ </antcall>
+ </target>
- <target name="jst-server-tomcat-tests" description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.tomcat.core.tests}" />
- <param name="report" value="org.eclipse.jst.server.tomcat.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.tomcat.ui.tests}" />
- <param name="report" value="org.eclipse.jst.server.tomcat.ui.tests" />
- </antcall>
- </target>
+ <target name="jst-server-tomcat-tests" description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.tomcat.core.tests}" />
+ <param name="report" value="org.eclipse.jst.server.tomcat.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.tomcat.ui.tests}" />
+ <param name="report" value="org.eclipse.jst.server.tomcat.ui.tests" />
+ </antcall>
+ </target>
- <target name="jst-server-generic-tests" description="Runs the org.eclipse.jst.server.generic.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.generic.tests}" />
- <param name="report" value="org.eclipse.jst.server.generic.tests" />
- </antcall>
- </target>
+ <target name="jst-server-generic-tests" description="Runs the org.eclipse.jst.server.generic.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.generic.tests}" />
+ <param name="report" value="org.eclipse.jst.server.generic.tests" />
+ </antcall>
+ </target>
- <target name="jst-server-geronimo-tests" description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.geronimo.core.tests}" />
- <param name="report" value="org.eclipse.jst.server.geronimo.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.server.geronimo.ui.tests}" />
- <param name="report" value="org.eclipse.jst.server.geronimo.ui.tests" />
- </antcall>
- </target>
+ <target name="jst-server-geronimo-tests" description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.geronimo.core.tests}" />
+ <param name="report" value="org.eclipse.jst.server.geronimo.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.server.geronimo.ui.tests}" />
+ <param name="report" value="org.eclipse.jst.server.geronimo.ui.tests" />
+ </antcall>
+ </target>
- <target name="jst-j2ee-core-tests" description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.j2ee.core.tests}" />
- <param name="report" value="org.eclipse.jst.j2ee.core.tests" />
- </antcall>
- </target>
+ <target name="jst-j2ee-core-tests" description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.j2ee.core.tests}" />
+ <param name="report" value="org.eclipse.jst.j2ee.core.tests" />
+ </antcall>
+ </target>
- <target name="jst-j2ee-tests" description="Runs the org.eclipse.jst.j2ee.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.j2ee.tests}" />
- <param name="report" value="org.eclipse.jst.j2ee.tests" />
- </antcall>
- </target>
+ <target name="jst-j2ee-tests" description="Runs the org.eclipse.jst.j2ee.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.j2ee.tests}" />
+ <param name="report" value="org.eclipse.jst.j2ee.tests" />
+ </antcall>
+ </target>
- <target name="wst-common-tests" description="Runs the org.eclipse.jst.j2ee.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.common.tests}" />
- <param name="report" value="org.eclipse.wst.common.tests" />
- </antcall>
- </target>
+ <target name="wst-common-tests" description="Runs the org.eclipse.jst.j2ee.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.common.tests}" />
+ <param name="report" value="org.eclipse.wst.common.tests" />
+ </antcall>
+ </target>
- <target name="wst-common-snippets-tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.common.snippets.tests}" />
- <param name="report" value="org.eclipse.wst.common.snippets.tests" />
- </antcall>
- </target>
+ <target name="wst-common-snippets-tests">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.common.snippets.tests}" />
+ <param name="report" value="org.eclipse.wst.common.snippets.tests" />
+ </antcall>
+ </target>
- <target name="jst-servlet-tests" description="Runs the org.eclipse.jst.servlet.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.servlet.tests}" />
- <param name="report" value="org.eclipse.jst.servlet.tests" />
- </antcall>
- </target>
+ <target name="jst-servlet-tests" description="Runs the org.eclipse.jst.servlet.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.servlet.tests}" />
+ <param name="report" value="org.eclipse.jst.servlet.tests" />
+ </antcall>
+ </target>
- <target name="jst-validation-framework-tests" description="Runs the org.eclipse.jst.validation.test test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.validation.test}" />
- <param name="report" value="org.eclipse.jst.validation.test" />
- </antcall>
- </target>
+ <target name="jst-validation-framework-tests" description="Runs the org.eclipse.jst.validation.test test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.validation.test}" />
+ <param name="report" value="org.eclipse.jst.validation.test" />
+ </antcall>
+ </target>
- <!-- JSP TESTS -->
- <target name="jst-jsp-tests" description="Runs test.xml for
+ <!-- JSP TESTS -->
+ <target name="jst-jsp-tests" description="Runs test.xml for
org.eclipse.jst.jsp.core.tests
org.eclipse.jst.jsp.ui.tests
org.eclipse.jst.jsp.tests.encoding">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsp.core.tests}" />
- <param name="report" value="org.eclipse.jst.jsp.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsp.ui.tests}" />
- <param name="report" value="org.eclipse.jst.jsp.ui.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsp.tests.encoding}" />
- <param name="report" value="org.eclipse.jst.jsp.tests.encoding" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsp.core.tests}" />
+ <param name="report" value="org.eclipse.jst.jsp.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsp.ui.tests}" />
+ <param name="report" value="org.eclipse.jst.jsp.ui.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsp.tests.encoding}" />
+ <param name="report" value="org.eclipse.jst.jsp.tests.encoding" />
+ </antcall>
+ </target>
- <!-- SSE TESTS -->
- <target name="wst-sse-tests" description="Runs test.xml for
+ <!-- SSE TESTS -->
+ <target name="wst-sse-tests" description="Runs test.xml for
org.eclipse.wst.sse.core.tests
org.eclipse.wst.sse.ui.tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.sse.core.tests}" />
- <param name="report" value="org.eclipse.wst.sse.core.tests" />
- </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.sse.core.tests}" />
+ <param name="report" value="org.eclipse.wst.sse.core.tests" />
+ </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.sse.ui.tests}" />
- <param name="report" value="org.eclipse.wst.sse.ui.tests" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.sse.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.sse.ui.tests" />
+ </antcall>
+ </target>
- <!-- XML TESTS -->
- <target name="wst-xml-tests" description="Runs test.xml for
+ <!-- XML TESTS -->
+ <target name="wst-xml-tests" description="Runs test.xml for
org.eclipse.wst.xml.core.tests
org.eclipse.wst.xml.ui.tests
org.eclipse.wst.xml.tests.encoding
org.eclipse.wst.xml.validation.tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.xml.core.tests}" />
- <param name="report" value="org.eclipse.wst.xml.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.xml.ui.tests}" />
- <param name="report" value="org.eclipse.wst.xml.ui.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.xml.tests.encoding}" />
- <param name="report" value="org.eclipse.wst.xml.tests.encoding" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.xml.validation.tests}" />
- <param name="report" value="org.eclipse.wst.xml.validation.tests" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.xml.core.tests}" />
+ <param name="report" value="org.eclipse.wst.xml.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.xml.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.xml.ui.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.xml.tests.encoding}" />
+ <param name="report" value="org.eclipse.wst.xml.tests.encoding" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.xml.validation.tests}" />
+ <param name="report" value="org.eclipse.wst.xml.validation.tests" />
+ </antcall>
+ </target>
- <!-- WSDL TESTS -->
- <target name="wst-wsdl-tests" description="Runs test.xml for
+ <!-- WSDL TESTS -->
+ <target name="wst-wsdl-tests" description="Runs test.xml for
org.eclipse.wst.wsdl.tests
org.eclipse.wst.wsdl.validation.tests">
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.wsdl.tests}" />
- <param name="report" value="org.eclipse.wst.wsdl.tests" />
- <param name="package.includes" value="org.eclipse.wst.wsdl"/>
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.wsdl.validation.tests}" />
- <param name="report" value="org.eclipse.wst.wsdl.validation.tests" />
- </antcall>
- </target>
+ <antcall target="runapitests">
+ <param name="testPlugin" value="${org.eclipse.wst.wsdl.tests}" />
+ <param name="report" value="org.eclipse.wst.wsdl.tests" />
+ <param name="package.includes" value="org.eclipse.wst.wsdl" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.wsdl.validation.tests}" />
+ <param name="report" value="org.eclipse.wst.wsdl.validation.tests" />
+ </antcall>
+ </target>
- <!-- WSI TESTS -->
- <target name="wst-wsi-tests" description="Runs test.xml for
+ <!-- WSI TESTS -->
+ <target name="wst-wsi-tests" description="Runs test.xml for
org.eclipse.wst.wsi.tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.wsi.tests}" />
- <param name="report" value="org.eclipse.wst.wsi.tests" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.wsi.tests}" />
+ <param name="report" value="org.eclipse.wst.wsi.tests" />
+ </antcall>
+ </target>
- <!-- XSD TESTS -->
- <target name="wst-xsd-tests" description="Runs test.xml for
+ <!-- XSD TESTS -->
+ <target name="wst-xsd-tests" description="Runs test.xml for
org.eclipse.wst.xsd.validation.tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.xsd.validation.tests}" />
- <param name="report" value="org.eclipse.wst.xsd.validation.tests" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.xsd.validation.tests}" />
+ <param name="report" value="org.eclipse.wst.xsd.validation.tests" />
+ </antcall>
+ </target>
- <!-- HTML TESTS -->
- <target name="wst-html-tests" description="Runs test.xml for
+ <!-- HTML TESTS -->
+ <target name="wst-html-tests" description="Runs test.xml for
org.eclipse.wst.html.core.tests
org.eclipse.wst.html.ui.tests
org.eclipse.wst.html.tests.encoding">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.html.core.tests}" />
- <param name="report" value="org.eclipse.wst.html.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.html.ui.tests}" />
- <param name="report" value="org.eclipse.wst.html.ui.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.html.tests.encoding}" />
- <param name="report" value="org.eclipse.wst.html.tests.encoding" />
- </antcall>
- </target>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.html.core.tests}" />
+ <param name="report" value="org.eclipse.wst.html.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.html.ui.tests}" />
+ <param name="report" value="org.eclipse.wst.html.ui.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.html.tests.encoding}" />
+ <param name="report" value="org.eclipse.wst.html.tests.encoding" />
+ </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>
+ <!-- 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
+ <!-- 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}" />
- <param name="report" value="org.eclipse.wst.css.core.tests" />
- </antcall>
- <antcall target="runtests">
- <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>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.css.core.tests}" />
+ <param name="report" value="org.eclipse.wst.css.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <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>
- <!-- JSF TESTS -->
- <target name="jsf-tests" description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsf.core.tests}" />
- <param name="report" value="org.eclipse.jst.jsf.core.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsf.ui.tests}" />
- <param name="report" value="org.eclipse.jst.jsf.ui.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsf.metadata.tests}" />
- <param name="report" value="org.eclipse.jst.jsf.metadata.tests" />
- </antcall>
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jsf.contentassist.tests}" />
- <param name="report" value="org.eclipse.jst.jsf.contentassist.tests" />
- </antcall>
- </target>
+ <!-- JSF TESTS -->
+ <target name="jsf-tests" description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsf.core.tests}" />
+ <param name="report" value="org.eclipse.jst.jsf.core.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsf.ui.tests}" />
+ <param name="report" value="org.eclipse.jst.jsf.ui.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsf.metadata.tests}" />
+ <param name="report" value="org.eclipse.jst.jsf.metadata.tests" />
+ </antcall>
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jsf.contentassist.tests}" />
+ <param name="report" value="org.eclipse.jst.jsf.contentassist.tests" />
+ </antcall>
+ </target>
- <!-- WS TESTS -->
+ <!-- WS TESTS -->
- <target name="wst-ws-tests" description="Runs the org.eclipse.wst.ws.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.ws.tests}" />
- <param name="report" value="org.eclipse.wst.ws.tests" />
- </antcall>
- </target>
+ <target name="wst-ws-tests" description="Runs the org.eclipse.wst.ws.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.ws.tests}" />
+ <param name="report" value="org.eclipse.wst.ws.tests" />
+ </antcall>
+ </target>
- <target name="jst-ws-tests" description="Runs the org.eclipse.jst.ws.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.ws.tests}" />
- <param name="report" value="org.eclipse.jst.ws.tests" />
- </antcall>
- </target>
+ <target name="jst-ws-tests" description="Runs the org.eclipse.jst.ws.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.ws.tests}" />
+ <param name="report" value="org.eclipse.jst.ws.tests" />
+ </antcall>
+ </target>
- <!-- Faceted Project Framework Tests -->
+ <!-- Faceted Project Framework Tests -->
- <target name="wst-facets-tests" description="Runs the Faceted Project Framework tests.">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.common.project.facet.core.tests}" />
- <param name="report" value="org.eclipse.wst.common.project.facet.core.tests" />
- </antcall>
- </target>
+ <target name="wst-facets-tests" description="Runs the Faceted Project Framework tests.">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.wst.common.project.facet.core.tests}" />
+ <param name="report" value="org.eclipse.wst.common.project.facet.core.tests" />
+ </antcall>
+ </target>
- <!-- Dali tests -->
- <target name="jpa-utility-tests" description="Runs the org.eclipse.jst.jpa.utility.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jpa.utility.tests}" />
- <param name="report" value="org.eclipse.jst.jpa.utility.tests" />
- </antcall>
- </target>
- <target name="dali-core-tests" description="Runs the org.eclipse.jst.jpa.core.tests test.xml">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jpa.core.tests}" />
- <param name="report" value="org.eclipse.jst.jpa.core.tests" />
- </antcall>
- </target>
+ <!-- Dali tests -->
+ <target name="jpa-utility-tests" description="Runs the org.eclipse.jst.jpa.utility.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jpa.utility.tests}" />
+ <param name="report" value="org.eclipse.jst.jpa.utility.tests" />
+ </antcall>
+ </target>
+ <target name="dali-core-tests" description="Runs the org.eclipse.jst.jpa.core.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jpa.core.tests}" />
+ <param name="report" value="org.eclipse.jst.jpa.core.tests" />
+ </antcall>
+ </target>
- <!-- releng Tests -->
+ <!-- releng Tests -->
- <target name="releng-tests" 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="releng-tests" 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">
- <property file="${testRoot}/test2.properties"/>
+ <target name="all" depends="init">
+ <property file="${testRoot}/test2.properties" />
- <echo message="Starting WTP Unit Tests"/>
+ <echo message="Starting WTP Unit Tests" />
- <echo message="Starting releng tests"/>
- <antcall target="releng-tests" />
+ <echo message="Starting releng tests" />
+ <antcall target="releng-tests" />
- <echo message="Starting wst-server-tests"/>
- <antcall target="wst-server-tests"/>
+ <echo message="Starting wst-server-tests" />
+ <antcall target="wst-server-tests" />
- <echo message="Starting wst-monitor-tests"/>
- <antcall target="wst-monitor-tests"/>
+ <echo message="Starting wst-monitor-tests" />
+ <antcall target="wst-monitor-tests" />
- <echo message="Starting wst-cache-tests"/>
- <antcall target="wst-cache-tests"/>
+ <echo message="Starting wst-cache-tests" />
+ <antcall target="wst-cache-tests" />
- <echo message="Starting wst-common-tests"/>
- <antcall target="wst-common-tests" />
+ <echo message="Starting wst-common-tests" />
+ <antcall target="wst-common-tests" />
- <echo message="Starting wst-common-snippets-tests"/>
- <antcall target="wst-common-snippets-tests"/>
+ <echo message="Starting wst-common-snippets-tests" />
+ <antcall target="wst-common-snippets-tests" />
- <echo message="Starting wst-sse-tests"/>
- <antcall target="wst-sse-tests" />
+ <echo message="Starting wst-sse-tests" />
+ <antcall target="wst-sse-tests" />
- <echo message="Starting wst-xml-tests"/>
- <antcall target="wst-xml-tests" />
+ <echo message="Starting wst-xml-tests" />
+ <antcall target="wst-xml-tests" />
- <echo message="Starting wst-wsdl-tests"/>
- <antcall target="wst-wsdl-tests" />
+ <echo message="Starting wst-wsdl-tests" />
+ <antcall target="wst-wsdl-tests" />
- <echo message="Starting wst-wsi-tests"/>
- <antcall target="wst-wsi-tests" />
+ <echo message="Starting wst-wsi-tests" />
+ <antcall target="wst-wsi-tests" />
- <echo message="Starting wst-xsd-tests"/>
- <antcall target="wst-xsd-tests" />
+ <echo message="Starting wst-xsd-tests" />
+ <antcall target="wst-xsd-tests" />
- <echo message="Starting wst-html-tests"/>
- <antcall target="wst-html-tests" />
+ <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-dtd-tests" />
+ <antcall target="wst-dtd-tests" />
- <echo message="Starting wst-css-tests"/>
- <antcall target="wst-css-tests" />
+ <echo message="Starting wst-css-tests" />
+ <antcall target="wst-css-tests" />
- <echo message="Starting wst-ws-tests"/>
- <antcall target="wst-ws-tests" />
+ <echo message="Starting wst-ws-tests" />
+ <antcall target="wst-ws-tests" />
- <echo message="Starting jst-server-tests"/>
- <antcall target="jst-server-tests"/>
+ <echo message="Starting jst-server-tests" />
+ <antcall target="jst-server-tests" />
- <echo message="Starting jst-server-tomcat-tests"/>
- <antcall target="jst-server-tomcat-tests"/>
+ <echo message="Starting jst-server-tomcat-tests" />
+ <antcall target="jst-server-tomcat-tests" />
- <echo message="Starting jst-server-geronimo-tests"/>
- <antcall target="jst-server-geronimo-tests"/>
+ <echo message="Starting jst-server-geronimo-tests" />
+ <antcall target="jst-server-geronimo-tests" />
- <echo message="Starting jst-server-generic-tests"/>
- <antcall target="jst-server-generic-tests"/>
+ <echo message="Starting jst-server-generic-tests" />
+ <antcall target="jst-server-generic-tests" />
- <echo message="Starting jst-j2ee-core-tests"/>
- <antcall target="jst-j2ee-core-tests" />
+ <echo message="Starting jst-j2ee-core-tests" />
+ <antcall target="jst-j2ee-core-tests" />
- <echo message="Starting jst-j2ee-tests"/>
- <antcall target="jst-j2ee-tests" />
+ <echo message="Starting jst-j2ee-tests" />
+ <antcall target="jst-j2ee-tests" />
- <echo message="Starting jst-servlet-tests"/>
- <antcall target="jst-servlet-tests" />
+ <echo message="Starting jst-servlet-tests" />
+ <antcall target="jst-servlet-tests" />
- <echo message="Starting jst-validation-framework-tests"/>
- <antcall target="jst-validation-framework-tests" />
+ <echo message="Starting jst-validation-framework-tests" />
+ <antcall target="jst-validation-framework-tests" />
- <echo message="Starting jst-jsp-tests"/>
- <antcall target="jst-jsp-tests" />
+ <echo message="Starting jst-jsp-tests" />
+ <antcall target="jst-jsp-tests" />
- <echo message="Starting jst-ws-tests"/>
- <antcall target="jst-ws-tests" />
+ <echo message="Starting jst-ws-tests" />
+ <antcall target="jst-ws-tests" />
- <echo message="Starting wst-facets-tests"/>
- <antcall target="wst-facets-tests" />
+ <echo message="Starting wst-facets-tests" />
+ <antcall target="wst-facets-tests" />
- <echo message="Starting JPA Unit Tests"/>
+ <echo message="Starting JPA Unit Tests" />
- <echo message="Starting jpa-utility-tests"/>
- <antcall target="jpa-utility-tests" />
- <echo message="Starting dali-core-tests"/>
- <antcall target="dali-core-tests" />
+ <echo message="Starting jpa-utility-tests" />
+ <antcall target="jpa-utility-tests" />
+ <echo message="Starting dali-core-tests" />
+ <antcall target="dali-core-tests" />
- <echo message="Ended JPA Unit Tests"/>
+ <echo message="Ended JPA Unit Tests" />
- <echo message="Starting JSF Tests"/>
- <antcall target="jsf-tests" />
+ <echo message="Starting JSF Tests" />
+ <antcall target="jsf-tests" />
- <echo message="Ended WTP Unit Tests"/>
+ <echo message="Ended WTP Unit Tests" />
- </target>
+ </target>
- <target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided" unless="genHtml.disable">
- <style style="JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
- </target>
+ <target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided" unless="genHtml.disable">
+ <style style="JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
+ </target>
- <target name="computePluginVersion">
- <java classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
- <classpath>
- <pathelement location="ComputePluginVersion.jar"/>
- </classpath>
- <arg value="${testRoot}/eclipse/plugins"/>
- <arg value="${testRoot}/test2.properties"/>
- </java>
- </target>
+ <target name="computePluginVersion">
+ <java classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
+ <classpath>
+ <pathelement location="ComputePluginVersion.jar" />
+ </classpath>
+ <arg value="${testRoot}/eclipse/plugins" />
+ <arg value="${testRoot}/test2.properties" />
+ </java>
+ </target>
</project>
\ No newline at end of file