diff options
| author | Thanh Ha | 2012-11-28 14:22:51 +0000 |
|---|---|---|
| committer | Thanh Ha | 2012-12-03 14:59:53 +0000 |
| commit | 2bfda35891e69cb1e140f8d2b811541eb90bd3c5 (patch) | |
| tree | f1e6e285f249c3da0105afb66036ec0fc232def5 | |
| parent | d202b15e7a02c0974fabf134b490bdced02e00a4 (diff) | |
| download | eclipse.platform.releng.aggregator-2bfda35891e69cb1e140f8d2b811541eb90bd3c5.tar.gz eclipse.platform.releng.aggregator-2bfda35891e69cb1e140f8d2b811541eb90bd3c5.tar.xz eclipse.platform.releng.aggregator-2bfda35891e69cb1e140f8d2b811541eb90bd3c5.zip | |
Bug 395099 - eclipse-junit-tests needs to include latest test scripts
9 files changed, 1717 insertions, 989 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/readme.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/readme.html index d1df078e5..90b31531e 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/readme.html +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/readme.html @@ -7,104 +7,104 @@ <body bgcolor="#FFFFFF" text="#000000"> <font size="+2"> Automated Testing of Eclipse Builds</font> -<p>Last updated: March 2, 2011</p><p><font size="+1">Description</font></p><p>This document describes how to run Eclipse JUnit plugin tests from the command - line using Eclipse SDK JUnit test plug-ins and a testing framework. This method of running tests is intended - for anyone who wishes to automate their testing process or reproduce the testing - mechanism used in Eclipse builds by the Eclipse Platform Release Engineering team.</p><p>Click <a href="http://dev.eclipse.org/viewcvs/index.cgi/*checkout*/org.eclipse.test/testframework.html?rev=HEAD">here</a> for a description of the testing - framework, and how it can be used outside of the setup described here.</p><p>If you simply wish to write and run JUnit tests interactively from an Eclipse +<p>Last updated: March 2, 2011</p><p><font size="+1">Description</font></p><p>This document describes how to run Eclipse JUnit plugin tests from the command + line using Eclipse SDK JUnit test plug-ins and a testing framework. This method of running tests is intended + for anyone who wishes to automate their testing process or reproduce the testing + mechanism used in Eclipse builds by the Eclipse Platform Release Engineering team.</p><p>Click <a href="http://dev.eclipse.org/viewcvs/index.cgi/*checkout*/org.eclipse.test/testframework.html?rev=HEAD">here</a> for a description of the testing + framework, and how it can be used outside of the setup described here.</p><p>If you simply wish to write and run JUnit tests interactively from an Eclipse workbench, try one of the links below:</p><p><a href="http://help.eclipse.org/helios/index.jsp?topic=/org.eclipse.jdt.doc.user/gettingStarted/qs-junit.htm">JUnit Support in Eclipse</a><br> <a href="http://help.eclipse.org/helios/index.jsp?topic=/org.eclipse.pde.doc.user/guide/tools/launchers/junit_launcher.htm">Testing Eclipse Plug-ins with JUnit</a></p><p><font size="+1">Requirements</font></p> <ol> - <li>All test machines will require 1.4 and 1.5 java runtime environments installed to run all tests. See <A HREF="#testtargets">test targets</A> + <li>All test machines will require 1.4 and 1.5 java runtime environments installed to run all tests. See <A HREF="#testtargets">test targets</A> for details on which tests require a 1.5 level jre. All other tests can be executed with either jre levels.</li> - + <li>A properties file containing the following key-value pair: J2SE-5.0=<path to 1.5 java executable>. On Windows, the path must be enclosed with double quotes if it contains any space characters, e.g. J2SE-5.0="c:/program files/jdk1.5.0/jre/bin/java".</li> - + <li><a href="http://www.info-zip.org/pub/infozip/UnZip.html">Info-ZIP UnZip</a> version 5.41 or later installed and added to the path.</li> - - <li>The JUnit Plugin Tests <code>eclipse-Automated-Tests-<buildId>.zip</code> from an Eclipse build (<a href="http://download.eclipse.org/eclipse/downloads/">http://download.eclipse.org/eclipse/downloads/</a>). + + <li>The JUnit Plugin Tests <code>eclipse-Automated-Tests-<buildId>.zip</code> from an Eclipse build (<a href="http://download.eclipse.org/eclipse/downloads/">http://download.eclipse.org/eclipse/downloads/</a>). This ZIP contains this document, scripts to run the tests, the test framework plug-ins and the JUnit test plug-ins.</li> - <li>An Eclipse SDK distribution (<a href="http://download.eclipse.org/eclipse/downloads/">http://download.eclipse.org/eclipse/downloads/</a>) - to test. Usually you will want to test a particular Eclipse build using a matching + <li>An Eclipse SDK distribution (<a href="http://download.eclipse.org/eclipse/downloads/">http://download.eclipse.org/eclipse/downloads/</a>) + to test. Usually you will want to test a particular Eclipse build using a matching Automated Tests feature. - - <li>To run the pde build tests you will need the eclipse-<buildId>delta-pack.zip.</li> - - <li>To run the Team CVS tests you will need extssh access to a CVS repository. - The tests create a lot of junk modules and tags so you will want to keep the - test repository seperate from your development repository. While it is not necessary - to clean up the repository between each Team test run you will probably want + + <li>To run the pde build tests you will need the eclipse-<buildId>delta-pack.zip.</li> + + <li>To run the Team CVS tests you will need extssh access to a CVS repository. + The tests create a lot of junk modules and tags so you will want to keep the + test repository seperate from your development repository. While it is not necessary + to clean up the repository between each Team test run you will probably want to clean it up periodically.</li> - + <li>Some of the p2 tests require a copy of the Eclipse Platform Runtime Binary archive for the platform you are testing. More information is available from the <a href="http://wiki.eclipse.org/Equinox/p2/Testing">Equinox Testing Wiki page</a>.</li> -</ol> - +</ol> + <p><font size="+1">Setup</font></p> <ol> - <li>Extract the eclipse-Automated-Tests-<buildId>.zip or tar.gz. On Window, extract this file close to the root of the drive to prevent some path names from exceeding + <li>Extract the eclipse-Automated-Tests-<buildId>.zip or tar.gz. On Window, extract this file close to the root of the drive to prevent some path names from exceeding the 255 character limit. This will create a top-level directory <code>eclipse-testing</code>.</li> - - <li>Place the Eclipse SDK distribution to test (and the Eclipse Platform Runtime Binary) in the eclipse-testing directory. + + <li>Place the Eclipse SDK distribution to test (and the Eclipse Platform Runtime Binary) in the eclipse-testing directory. Do not extract these files as the test scripts will take care of this.</li> - <li>To run the Team CVS tests, edit the test.xml script to provide connection + <li>To run the Team CVS tests, edit the test.xml script to provide connection information. Replace the following strings in the <strong>teamcvs</strong> target of the <code>test.xml</code> file with the information described below: <ul> <li>@cvs_user@ - the account used to connect to the cvs repository</li> <li>@cvs_password@ - the account password</li><li>@cvs_host@- the name of the cvs server</li> <li>@cvs_root@ - the repository path</li> - </ul> - These values are used at test time to automatically replace strings in - org.eclipse.team.tests.cvs.core/repository.properties. For more information + </ul> + These values are used at test time to automatically replace strings in + org.eclipse.team.tests.cvs.core/repository.properties. For more information on how this file is used in the team CVS tests, click <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.team.tests.cvs.core/readme.html?rev=HEAD">here</a>.</li> </li> - + <li>To Run the PDE build scripts, save the eclipse-<buildId>delta-pack.zip to the eclipse-testing directory.</li> </ol> - + <p><font size="+1">Running Tests</font></p><p>From a command prompt or terminal:</p> <ol> <li><code>cd</code> to the <code>eclipse-testing</code> directory</li> - <li>Execute the following script:</p><p><b>runtests -properties <path to properties file> [-os <operating system>] [-ws <windowing system>] [-arch - <architecture>] [-noclean] [-vm + <li>Execute the following script:</p><p><b>runtests -properties <path to properties file> [-os <operating system>] [-ws <windowing system>] [-arch + <architecture>] [-noclean] [-vm <path to java executable>][-Dtest.target=performance][<I>targetname1 targetname2 targetname3 etc...</I>] </b></p><p>All parameters and targets are optional on windows systems with the exception of "-properties". On *nix systems, the os, ws and arch parameters - must be specified in addition to the -properties parameter.</p><p>The JUnit test results are produced in individual xml files for each test plug-in with a test.xml. These - results are copied to the eclipse-testing\results\xml directory. These results - can be converted into html by running the "genHtml" target as described - in the table below. Please be aware that "Build Successful" printed + must be specified in addition to the -properties parameter.</p><p>The JUnit test results are produced in individual xml files for each test plug-in with a test.xml. These + results are copied to the eclipse-testing\results\xml directory. These results + can be converted into html by running the "genHtml" target as described + in the table below. Please be aware that "Build Successful" printed to the console is NOT indicative of tests passing.</li> </ol> <p><font size="+1"><a name="vm"></a>Parameters</font></p><table width="90%" border="1"> - <tr> + <tr> <td>Parameter</td><td>Description</td></tr> - <tr> - <td>-os <operating system></td><td>The OS the tests are being run on. One of: aix, hpux, linux, macosx, solaris, + <tr> + <td>-os <operating system></td><td>The OS the tests are being run on. One of: aix, hpux, linux, macosx, solaris, win32. <b>Default win32</b></td></tr> - <tr> - <td>-ws <windowing system></td><td>The windowing system the tests are being run on. One of: cocoa, gtk, photon, + <tr> + <td>-ws <windowing system></td><td>The windowing system the tests are being run on. One of: cocoa, gtk, photon, win32. <b>Default win32</b></td></tr> - <tr> - <td>-arch <architecture></td><td>The architecture the tests are being run on. One of: ppc, PA_RISC, x86, + <tr> + <td>-arch <architecture></td><td>The architecture the tests are being run on. One of: ppc, PA_RISC, x86, sparc. <b>Default x86</b></td></tr> - <tr> - <td>-noclean</td><td>Run tests without installing a clean Eclipse (in "test-eclipse") between test targets. Default + <tr> + <td>-noclean</td><td>Run tests without installing a clean Eclipse (in "test-eclipse") between test targets. Default is to delete an existing test-eclipse directory and re-extract the Eclipse distribution between test targets.</td></tr> - <tr> - <td>-properties</td><td><P>As per requirements noted above, this is used to reference a properties file containing additional Ant properties - used in running tests.Can be used to pass additional vm arguments to the - Java virtual machine running the tests by adding the entry "extraVMargs=<the + <tr> + <td>-properties</td><td><P>As per requirements noted above, this is used to reference a properties file containing additional Ant properties + used in running tests.Can be used to pass additional vm arguments to the + Java virtual machine running the tests by adding the entry "extraVMargs=<the args to pass to the vm>" to the specified properties file.<BR><BR>At a minimum, the property file must include a "J2SE-5.0" property which specifies a path to a 1.5 java executable, for example:<BR><BR><B>J2SE-5.0="c:/program files/jdk1.5.0_06/jre/bin/java"</B></P><P>The path must be enclosed in double quotes if it contains spaces. This key-value pair is required to run JUnit plug-in tests that require a 1.5 level jvm.</P></td></tr> - <tr> - <td>-vm</td><td><P>When runtests is executed, two instances of eclipse are started: one to invoke the org.eclipse.ant.core.antRunner application to run a test.xml script in a test plug-in (outer instance) and another in which the JUnit tests are being executed (inner). By default, both will use the java executable on the system path. The -vm property is used to specify an alternate java executable. + <tr> + <td>-vm</td><td><P>When runtests is executed, two instances of eclipse are started: one to invoke the org.eclipse.ant.core.antRunner application to run a test.xml script in a test plug-in (outer instance) and another in which the JUnit tests are being executed (inner). By default, both will use the java executable on the system path. The -vm property is used to specify an alternate java executable. For example, "-vm c:\jdk142\jre\bin\java".<BR><BR> However, the -vm value is ignored by the inner vm for JUnit plug-in tests requiring a 1.5 JRE to execute (see <A HREF="#testtargets">test targets</A>). This property must be used in conjunction with the -properties parameter described above at all times.</P></td></tr> <tr> - <td>-Dtest.target=performance</td><td>Runs the performance target only in each test plug-in's test.xml. When running tests on Windows, + <td>-Dtest.target=performance</td><td>Runs the performance target only in each test plug-in's test.xml. When running tests on Windows, enclose this parameter in double quotes, ie. runtests "-Dtest.target=performance".</td></tr><tr><td>targetname1 targetname2 targetname3 etc..</td><td><P>Replace with a list of <A HREF="#testtargets">test targets</A> to execute (space delineated). Each corresponds to an Ant target in the eclipse-testing/test.xml script. <BR><BR>For example, <BR><B>runtests -os linux -ws gtk -arch x86 ant antui -properties vm.properties</B><BR> This will execute the "ant" and "antui" test targets only. If not specified, the "all" target will be executed.<BR></P></td></tr> </table><p><font size="+1"><A NAME="testtargets"></A>Appendix A - Test Targets</font></p><p>Ant targets in the main test.xml which execute tests. Typically each corresponds to the execution of a test plug-in's test.xml.<BR></p><table width="90%" border="1"><tr><td WIDTH="34%">Target name (special jvm requirements)</td><td WIDTH="66%">Description / test plug-in</td></tr> - <tr> + <tr> <td WIDTH="34%">all (<B>1.4, 1.5 and 1.6 JREs required</B>)</td><td WIDTH="66%">Runs all the targets below. Default.</td></tr> <tr><td>ant</td><td>org.eclipse.ant.tests.core</td></tr> <tr><td>antui</td><td>org.eclipse.ant.tests.ui</td></tr> @@ -148,22 +148,21 @@ <tr><td>uiperformance</td><td>org.eclipse.ui.tests.performance</td></tr> <tr><td>uircp</td><td>org.eclipse.ui.tests.rcp</td></tr> <tr><td>uiviews</td><td>org.eclipse.ui.tests.views.properties.tabbed</td></tr> -<tr><td>uiworkbenchtexteditor</td><td>org.eclipse.ui.workbench.texteditor.tests</td></tr> -<tr><td>update</td><td>org.eclipse.update.tests.core</td></tr> +<tr><td>uiworkbenchtexteditor</td><td>org.eclipse.ui.workbench.texteditor.tests</td></tr> </table><p><br> -</p><p><font size="+1"><a name="appendixb"></a>Appendix B - Supported os, ws, and arch - value combinations</font></p><p>The following table contains the values that can be used with the -os, -ws, +</p><p><font size="+1"><a name="appendixb"></a>Appendix B - Supported os, ws, and arch + value combinations</font></p><p>The following table contains the values that can be used with the -os, -ws, and -arch switches.</p><table width="75%" border="1"> - <tr> - <td>Operating System (os)</td><td>Windowing System (ws)</td><td>Architecture (arch)</td></tr> - <tr> + <tr> + <td>Operating System (os)</td><td>Windowing System (ws)</td><td>Architecture (arch)</td></tr> + <tr> <td>hpux</td><td>motif</td><td>PA_RISC</td></tr> - <tr> + <tr> <td>linux</td><td>gtk</td><td>x86</td></tr> <tr> - <td>linux</td><td>gtk</td><td>x86_64</td></tr> + <td>linux</td><td>gtk</td><td>x86_64</td></tr> <tr> <td>macosx</td><td>carbox</td><td>ppc</td></tr> <tr> @@ -174,9 +173,9 @@ <td>solaris</td><td>gtk</td><td>sparc</td></tr> <tr> <td>solaris</td><td>gtk</td><td>x86</td></tr> - <tr> + <tr> <td>solaris</td><td>motif</td><td>sparc</td></tr> - <tr> + <tr> <td>win32</td><td>win32</td><td>x86</td></tr> </table> </body> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests index da0d6464d..d18879da4 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests @@ -1,87 +1,3 @@ -# !/bin/sh - -#set the DISPLAY for running tests on Linux -DISPLAY=:0.0;export DISPLAY - -# by default, use the java executable on the path for outer and test jvm -vmcmd=java - -#this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory -dir=. - -# operating system, windowing system and architecture variables -os= -ws= -arch= - -# list of tests (targets) to execute in test.xml -tests= - -# default value to determine if eclipse should be reinstalled between running of tests -installmode="clean" - -# name of a property file to pass to Ant -properties= - -# message printed to console -usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-noclean] [<test target>][-properties <path>]" - - -# proces command line arguments -while [ $# -gt 0 ] -do - case "$1" in - -dir) dir="$2"; shift;; - -os) os="$2"; shift;; - -ws) ws="$2"; shift;; - -arch) arch="$2"; shift;; - -noclean) installmode="noclean";; - -properties) properties="-propertyfile $2";shift;; - -vm) vmcmd="$2"; shift;; - *) tests=$tests\ $1;; - esac - shift -done - -# for *nix systems, os, ws and arch values must be specified -if [ "x$os" = "x" ] -then - echo >&2 "$usage" - exit 1 -fi - -if [ "x$ws" = "x" ] -then - echo >&2 "$usage" - exit 1 -fi - -if [ "x$arch" = "x" ] -then - echo >&2 "$usage" - exit 1 -fi - -#necessary when invoking this script through rsh -cd $dir - -# verify os, ws and arch values passed in are valid before running tests -if [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc64" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "hpux-gtk-ia64_32"] -then - if [ ! -r eclipse ] - then - tar -xzf eclipse-SDK-*.tar.gz - unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/ -fi - -# run tests -launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar` -$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file `pwd`/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger - -# display message to user if os, ws and arch are invalid -else - echo "The os, ws and arch values are either invalid or are an invalid combination" - -exit 1 -fi +#!/bin/sh +exec ./runtests.sh "$@"
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.bat b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.bat index f9a578deb..bac447a95 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.bat +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.bat @@ -1,8 +1,8 @@ @echo off +SETLOCAL REM default java executable for outer and test vm set vmcmd=java -set no_proxy=localhost,dev.eclipse.org,hudson.eclipse.org REM reset list of ant targets in test.xml to execute set tests= @@ -21,6 +21,9 @@ set arch=x86 REM reset ant command line args set ANT_CMD_LINE_ARGS= +IF EXIST localTestsProperties.bat CALL localTestsProperties.bat + + REM **************************************************************** REM REM Install Eclipse if it does not exist @@ -39,14 +42,19 @@ REM **************************************************************** if x%1==x goto run if x%1==x-ws set ws=%2 && shift && shift && goto processcmdlineargs -if x%1==x-os set os =%2 && shift && shift && goto processcmdlineargs +if x%1==x-os set os=%2 && shift && shift && goto processcmdlineargs if x%1==x-arch set arch=%2 && shift && shift && goto processcmdlineargs if x%1==x-noclean set installmode=noclean&& shift && goto processcmdlineargs if x%1==x-properties set properties=-propertyfile %2 && shift && shift && goto processcmdlineargs if x%1==x-vm set vmcmd="%2" && shift && shift && goto processcmdlineargs +if x%1==x-extdirprop SET extdirproperty="-Djava.ext.dirs=%2" && shift && shift && goto processcmdlineargs + + set tests=%tests% %1 && shift && goto processcmdlineargs +echo Specified test targets (if any): %tests% +echo Specified extdirs (if any): %extdirprop% :run REM *************************************************************************** @@ -56,8 +64,26 @@ REM get name of org.eclipse.equinox.launcher_*.jar with version label dir /b eclipse\plugins\org.eclipse.equinox.launcher_*.jar>launcher-jar-name.txt set /p launcher-jar=<launcher-jar-name.txt -%vmcmd% -Dosgi.os=%os% -Dosgi.ws=%ws% -Dosgi.arch=%arch% -jar eclipse\plugins\%launcher-jar% -data workspace -application org.eclipse.ant.core.antRunner -file test.xml %tests% -Dws=%ws% -Dos=%os% -Darch=%arch% -D%installmode%=true %properties% -logger org.apache.tools.ant.DefaultLogger -goto end +echo "list all environment variables in effect as tests start" +set + +rem -Dtimeout=300000 "%ANT_OPTS%" + +IF NOT EXIST %vmcmd% ( +ECHO ERROR: vmcmd not defined or does not exist: %vmcmd% +exit 1 +) + +REM -XshowSettings is supported on windows VMs but ... not every where. So where not supported +REM causes VM to not start at all. Can be handy for diagnostics. (without running ant <echoproperties/> + +IF DEFINED extdirproperty ( +%vmcmd% %extdirproperty% -Dosgi.os=%os% -Dosgi.ws=%ws% -Dosgi.arch=%arch% -jar eclipse\plugins\%launcher-jar% -data workspace -application org.eclipse.ant.core.antRunner -file test.xml %tests% -Dws=%ws% -Dos=%os% -Darch=%arch% -D%installmode%=true %properties% -logger org.apache.tools.ant.DefaultLogger +GOTO END +) + +%vmcmd% -Dosgi.os=%os% -Dosgi.ws=%ws% -Dosgi.arch=%arch% -jar eclipse\plugins\%launcher-jar% -data workspace -application org.eclipse.ant.core.antRunner -file test.xml %tests% -Dws=%ws% -Dos=%os% -Darch=%arch% -D%installmode%=true %properties% -logger org.apache.tools.ant.DefaultLogger + +:END -:end diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh index 10ad816da..7ac5758b6 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh @@ -1,15 +1,23 @@ -#!/bin/sh +#!/usr/bin/env bash + +# This file should never exist or be needed for production machine, +# but allows an easy way for a "local user" to provide this file +# somewhere on the search path ($HOME/bin is common), +# and it will be included here, thus can provide "override values" +# to those defined by defaults for production machine., +# such as for vmcmd + +source localTestsProperties.shsource -#set the DISPLAY for running tests on Linux -#DISPLAY=`$HOST`:0.0;export DISPLAY -export no_proxy=localhost,dev.eclipse.org,hudson.eclipse.org # by default, use the java executable on the path for outer and test jvm -#vmcmd=/shared/common/jdk-1.6.x86_64/jre/bin/java +#vmcmd=${vmcmd:-/shared/common/jdk-1.6.x86_64/jre/bin/java} vmcmd=java +echo "vmcmd: $vmcmd" + #this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory -dir=. +dir=${PWD} # operating system, windowing system and architecture variables os= @@ -25,6 +33,9 @@ installmode="clean" # name of a property file to pass to Ant properties= +# ext dir customization. Be sure "blank", if not defined explicitly on command line +extdirproperty= + # message printed to console usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-noclean] [<test target>][-properties <path>]" @@ -32,58 +43,105 @@ usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-n # proces command line arguments while [ $# -gt 0 ] do - case "$1" in - -dir) dir="$2"; shift;; - -os) os="$2"; shift;; - -ws) ws="$2"; shift;; - -arch) arch="$2"; shift;; - -noclean) installmode="noclean";; - -properties) properties="-propertyfile $2";shift;; - -vm) vmcmd="$2"; shift;; - *) tests=$tests\ $1;; - esac - shift + case "${1}" in + -dir) + dir="${2}"; shift;; + -os) + os="${2}"; shift;; + -ws) + ws="${2}"; shift;; + -arch) + arch="${2}"; shift;; + -noclean) + installmode="noclean";; + -properties) + properties="-propertyfile ${2}";shift;; + -extdirprop) + extdirproperty="-Djava.ext.dirs=${2}";shift;; + -vm) + vmcmd="${2}"; shift;; + *) + tests=$tests\ ${1};; + esac + shift done +echo "Specified test targets (if any): ${tests}" + +echo "Specified ext dir (if any): ${extdirproperty}" + # for *nix systems, os, ws and arch values must be specified if [ "x$os" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$ws" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$arch" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi #necessary when invoking this script through rsh cd $dir -# verify os, ws and arch values passed in are valid before running tests -if [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc64" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "hpux-gtk-ia64_32"] -then - if [ ! -r eclipse ] - then - tar -xzf eclipse-SDK-*.tar.gz - unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/ -fi - -# run tests -launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar` -$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file `pwd`/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger - -# display message to user if os, ws and arch are invalid -else - echo "The os, ws and arch values are either invalid or are an invalid combination" - -exit 1 -fi - + if [ ! -r eclipse ] + then + tar -xzf eclipse-SDK-*.tar.gz + # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. + unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ + fi + + # run tests + launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar` + + + # make sure there is a window manager running. See bug 379026 + # we should not have to, but may be a quirk/bug of hudson setup + # assuming metacity attaches to "current" display by default (which should have + # already been set by Hudson). We echo its value here just for extra reference/cross-checks. + + echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):" + wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep) + echo "Window Manager processes: $wmpss" + echo + + if [[ -z $wmpss ]] + then + echo "No window managers processes found running, so will start metacity" + metacity --replace --sm-disable & + METACITYPID=$! + echo $METACITYPID > epmetacity.pid + else + echo "Existing window manager found running, so did not force start of metacity" + fi + + echo + + # list out metacity processes so overtime we can see if they accumulate, or if killed automatically + # when our process exits. If not automatic, should use epmetacity.pid to kill it when we are done. + echo "Current metacity processes running (check for accumulation):" + ps -ef | grep "metacity" | grep -v grep + echo + + echo "Triple check if any window managers are running (at least metacity should be!):" + wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep) + echo "Window Manager processes: $wmpss" + echo + echo "extdirprop in runtest: ${extdirprop}" + echo "extdirproperty in runtest: ${extdirproperty}" + + # -Dtimeout=300000 "${ANT_OPTS}" + if [[ ! -z "${extdirproperty}" ]] + then + $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + else + $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + fi diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtestsmac.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtestsmac.sh new file mode 100755 index 000000000..87210f197 --- /dev/null +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtestsmac.sh @@ -0,0 +1,123 @@ +#!/usr/bin/env bash + +# This file should never exist or be needed for production machine, +# but allows an easy way for a "local user" to provide this file +# somewhere on the search path ($HOME/bin is common), +# and it will be included here, thus can provide "override values" +# to those defined by defaults for production machine., +# such as for vmcmd + +source localTestsProperties.shsource + +# by default, use the java executable on the path for outer and test jvm +#vmcmd=/shared/common/jdk-1.6.x86_64/jre/bin/java +if [[ -z "{vmcmd}" ]] +then + vmcmd=java +fi + +echo "vmcmd: $vmcmd" + +#this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory +dir=. + +# operating system, windowing system and architecture variables +os= +ws= +arch= + +# list of tests (targets) to execute in test.xml +tests= + +# default value to determine if eclipse should be reinstalled between running of tests +installmode="clean" + +# name of a property file to pass to Ant +properties= + +# ext dir customization. Be sure "blank", if not defined explicitly on command line +extdirproperty= + +# message printed to console +usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-noclean] [<test target>][-properties <path>]" + + +# proces command line arguments +while [ $# -gt 0 ] +do + case "${1}" in + -dir) + dir="${2}"; shift;; + -os) + os="${2}"; shift;; + -ws) + ws="${2}"; shift;; + -arch) + arch="${2}"; shift;; + -noclean) + installmode="noclean";; + -properties) + properties="-propertyfile ${2}";shift;; + -extdirprop) + extdirproperty="-Djava.ext.dirs=${2}";shift;; + -vm) + vmcmd="${2}"; shift;; + *) + tests=$tests\ ${1};; + esac + shift +done + +echo "Specified test targets (if any): ${tests}" + +echo "Specified ext dir (if any): ${extdirproperty}" + +# for *nix systems, os, ws and arch values must be specified +if [ "x$os" = "x" ] +then + echo >&2 "$usage" + exit 1 +fi + +if [ "x$ws" = "x" ] +then + echo >&2 "$usage" + exit 1 +fi + +if [ "x$arch" = "x" ] +then + echo >&2 "$usage" + exit 1 +fi + +#necessary when invoking this script through rsh +cd $dir + +if [[ ! -r eclipse ]] +then + tar -xzf eclipse-SDK-*.tar.gz + # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. + unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ +fi + + +# run tests +launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar` + +# it have been recommended not to "probe and publish" information about systems +# for slight improvement in security. Bug 387747 +# so I have commented out most such probes, so they won't be routine. + + #echo "list all environment variables in effect as tests start" + #printenv + +# -Dtimeout=300000 "${ANT_OPTS}" + if [[ ! -z "${extdirproperty}" ]] + then + $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + else + $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + fi + + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml index 907429f22..f318fa3af 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml @@ -1,404 +1,742 @@ -<project name="Automated Eclipse Testing" default="all" basedir="." > +<?xml version="1.0" encoding="UTF-8"?> +<project + name="Automated Eclipse Testing" + default="all" + basedir="."> <!--properties file containing the plugin directory name including version number, and list of required test plug-ins expressed as command-line argument to unzip executable. Generated and packaged at build time.--> - <property file="test.properties" /> + <property file="test.properties" /> <!--properties file containing the build information--> - <property file="label.properties" /> + <property file="label.properties" /> <!--default directory where test-eclipse will be installed--> - <property name="install" value="${basedir}/test-eclipse" /> + <property + name="install" + value="${basedir}/test-eclipse" /> <!--suffix added to test output files to identify platform on which tests ran.--> - <property name="platform" value="${os}.${ws}.${arch}" /> + <property + name="platform" + value="${os}.${ws}.${arch}" /> <!-- The root of the eclipse installation --> - <property name="eclipse-home" value="${install}/eclipse" /> - - <property name="repoZip" value="${basedir}/eclipse-junit-tests-${buildId}.zip" /> - <property name="repoLocation" value="${basedir}/testRepo" /> - <property name="platformLocation" value="${basedir}/platformLocation" /> + <property + name="eclipse-home" + value="${install}/eclipse" /> + + <property + name="repoZip" + value="${basedir}/eclipse-junit-tests-${buildId}.zip" /> + <property + name="repoLocation" + value="${basedir}/testRepo" /> + <property + name="platformLocation" + value="${basedir}/platformLocation" /> <!-- The directory that will contain all files containing information on the tests that ran.--> - <property name="results" value="${basedir}/results" /> + <property + name="results" + value="${basedir}/results" /> <!--Directory for JUnit report output, console log output and .log content for each test suite. Overrides default in org.eclipse.test/library.xml--> - <property name="junit-report-output" value="${results}/${platform}" /> - <property name="coverage-output" value="${results}/coverage" /> - + <property + name="junit-report-output" + value="${results}/${platform}" /> + + <!-- this dirctory, with some sort files are created during unit tests + ... need to find where to disable jacoco --> + <property + name="coverage-output" + value="${results}/coverageIGNORE" /> + + <echo message="DEBUG: org.eclipse.core.net.prefs: ${org.eclipse.core.net.prefs}" /> + <!--Directory name of org.eclipse.test plug-in installed in ${eclipse-home}--> - <target name="setup" unless="noclean" depends="init"> - <condition property="setupTarget" value="setup-zip"> - <contains string="${runtimeArchive}" substring=".zip" /> - </condition> - <condition property="setupTarget" value="setup-tar.gz"> - <contains string="${runtimeArchive}" substring=".tar.gz" /> - </condition> - <condition property="repoexists" value="true"> - <available file="${repoLocation}" /> - </condition> - <condition property="extraIU" value="org.eclipse.equinox.p2.discovery.feature.feature.group"> - <equals arg1="${testPlugin}" arg2="org.eclipse.equinox.p2.tests.discovery" /> - </condition> - <antcall target="setupRepo" /> - <antcall target="${setupTarget}" /> - <antcall target="configureDeltaPack" /> - </target> + <target + name="setup" + unless="noclean" + depends="init"> + <condition + property="setupTarget" + value="setup-zip"> + <contains + string="${runtimeArchive}" + substring=".zip" /> + </condition> + <condition + property="setupTarget" + value="setup-tar.gz"> + <contains + string="${runtimeArchive}" + substring=".tar.gz" /> + </condition> + <condition + property="repoexists" + value="true"> + <available file="${repoLocation}" /> + </condition> + <condition + property="extraIU" + value="org.eclipse.equinox.p2.discovery.feature.feature.group"> + <equals + arg1="${testPlugin}" + arg2="org.eclipse.equinox.p2.tests.discovery" /> + </condition> + <antcall target="setupRepo" /> + <antcall target="${setupTarget}" /> + <antcall target="configureDeltaPack" /> + <antcall target="installPreferences" /> + </target> + + <target name="installPreferences"> + <property + name="preferenceDirectory" + value="${install}/eclipse/configuration/.settings/" /> + <mkdir dir="${preferenceDirectory}" /> + + <antcall target="installNetworkPreferences" /> + + </target> + + + <target + name="installNetworkPreferences" + if="org.eclipse.core.net.prefs"> + + <copy + file="${org.eclipse.core.net.prefs}" + todir="${preferenceDirectory}" + failonerror="false" + verbose="true" /> + <echo message="copied ${org.eclipse.core.net.prefs} to ${preferenceDirectory}" /> + </target> <!--Extract test bundles repo --> - <target name="setupRepo" unless="repoexists"> - <mkdir dir="${repoLocation}" /> - <exec dir="." executable="unzip"> - <arg line="-o ${repoZip} -d ${repoLocation}" /> - </exec> - </target> + <target + name="setupRepo" + unless="repoexists"> + <mkdir dir="${repoLocation}" /> + <exec + dir="." + executable="unzip"> + <arg line="-o ${repoZip} -d ${repoLocation}" /> + </exec> + </target> <!--setup for zip archives--> - <target name="setup-zip" description="Reinstall the test Eclipse installation if specified by user"> - <delete dir="${install}" /> - <mkdir dir="${install}" /> - <exec dir="." executable="unzip"> - <arg line="-o -qq ${runtimeArchive} -d ${install}" /> - </exec> - <antcall target="installExtraPlugins" /> - <antcall target="installTestPlugins" /> - </target> + <target + name="setup-zip" + description="Reinstall the test Eclipse installation if specified by user"> + <delete dir="${install}" /> + <mkdir dir="${install}" /> + <exec + dir="." + executable="unzip"> + <arg line="-o -qq ${runtimeArchive} -d ${install}" /> + </exec> + <antcall target="installExtraPlugins" /> + <antcall target="installTestPlugins" /> + </target> <!--setup for tar.gz archives--> - <target name="setup-tar.gz" description="Reinstall the test Eclipse installation if specified by user"> - <property name="currentDir" value="${basedir}" /> - <delete dir="${install}" /> - <mkdir dir="${install}" /> - <exec dir="${install}" executable="tar"> - <arg line="-xzf ${currentDir}/${runtimeArchive}" /> - </exec> - <antcall target="installExtraPlugins" /> - <antcall target="installTestPlugins" /> - </target> + <target + name="setup-tar.gz" + description="Reinstall the test Eclipse installation if specified by user"> + <property + name="currentDir" + value="${basedir}" /> + <delete dir="${install}" /> + <mkdir dir="${install}" /> + <exec + dir="${install}" + executable="tar"> + <arg line="-xzf ${currentDir}/${runtimeArchive}" /> + </exec> + <antcall target="installExtraPlugins" /> + <antcall target="installTestPlugins" /> + </target> <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail --> - <target name="setupPlatform"> - <echo message="os.arch ${os.arch}" /> - <property file="equinoxp2tests.properties" /> - <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}"> - <and> - <os family="unix" /> - <not> - <or> - <or> - <os arch="x86_64" /> - <os arch="amd64" /> - </or> - <os family="mac" /> - </or> - </not> - </and> - </condition> - <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}"> - <and> - <os family="mac" /> - <os family="unix" /> - <or> - <os arch="x86_64" /> - <os arch="amd64" /> - </or> - </and> - </condition> - <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}"> - <and> - <os family="windows" /> - <os arch="x86" /> - </and> - </condition> - <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}"> - <and> - <os family="windows" /> - <or> - <os arch="x86_64" /> - <os arch="amd64" /> - </or> - </and> - </condition> - <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}"> - <and> - <os family="unix" /> - <or> - <os arch="x86_64" /> - <os arch="amd64" /> - </or> - </and> - </condition> - <condition property="platformTarget" value="platform-zip"> - <contains string="${platformArchive}" substring=".zip" /> - </condition> - <condition property="platformTarget" value="platform-tar.gz"> - <contains string="${platformArchive}" substring=".tar.gz" /> - </condition> - <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" /> - <antcall target="${platformTarget}" /> - </target> + <target name="setupPlatform"> + <echo message="os.arch ${os.arch}" /> + <property file="equinoxp2tests.properties" /> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}"> + <and> + <os family="unix" /> + <not> + <or> + <or> + <os arch="x86_64" /> + <os arch="amd64" /> + </or> + <os family="mac" /> + </or> + </not> + </and> + </condition> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}"> + <and> + <os family="mac" /> + <os family="unix" /> + <or> + <os arch="x86_64" /> + <os arch="amd64" /> + </or> + </and> + </condition> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}"> + <and> + <os family="mac" /> + <os family="unix" /> + <!-- should not need, as long as x86_64 rules (above) comes first + <os arch="i386" /> + --> + </and> + </condition> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}"> + <and> + <os family="windows" /> + <os arch="x86" /> + </and> + </condition> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}"> + <and> + <os family="windows" /> + <or> + <os arch="x86_64" /> + <os arch="amd64" /> + </or> + </and> + </condition> + <condition + property="platformArchive" + value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}"> + <and> + <os family="unix" /> + <or> + <os arch="x86_64" /> + <os arch="amd64" /> + </or> + </and> + </condition> + + <fail + unless="platformArchive" + message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" /> + + <condition + property="platformTarget" + value="platform-zip"> + <contains + string="${platformArchive}" + substring=".zip" /> + </condition> + <condition + property="platformTarget" + value="platform-tar.gz"> + <contains + string="${platformArchive}" + substring=".tar.gz" /> + </condition> + <fail + unless="platformTarget" + message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" /> + <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" /> + <antcall target="${platformTarget}" /> + </target> <!--setup for platform zip archives--> - <target name="platform-zip" description="Reinstall the test Eclipse installation if specified by user"> - <delete dir="${platformLocation}" /> - <mkdir dir="${platformLocation}" /> - <exec dir="${platformLocation}" executable="unzip"> - <arg line="-o -qq ${platformArchive} -d ${platformLocation}" /> - </exec> - </target> + <target + name="platform-zip" + description="Reinstall the test Eclipse installation if specified by user"> + <delete dir="${platformLocation}" /> + <mkdir dir="${platformLocation}" /> + <exec + dir="${platformLocation}" + executable="unzip"> + <arg line="-o -qq ${platformArchive} -d ${platformLocation}" /> + </exec> + </target> <!--setup for platform tar.gz archives--> - <target name="platform-tar.gz" description="Reinstall the test Eclipse installation if specified by user"> - <delete dir="${platformLocation}" /> - <mkdir dir="${platformLocation}" /> - <exec dir="${platformLocation}" executable="tar"> - <arg line="-xzf ${platformArchive}" /> - </exec> - </target> - - <target name="installExtraPlugins" if="extraIU"> - <property file="equinoxp2tests.properties" /> - <path id="launcher.paths"> - <fileset dir="${eclipse-home}" includes="plugins/org.eclipse.equinox.launcher_*" /> - </path> - <property name="launcherPath" refid="launcher.paths" /> - - <property name="currentBuildRepo" value="${org.eclipse.equinox.p2.tests.current.build.repo}" /> - <echo>-installIU ${extraIU} +</echo> - <java jar="${launcherPath}" failonerror="false" dir="${eclipse-home}" timeout="900000" fork="true" output="${basedir}/director.log" resultproperty="directorcode"> - <arg line="-vm ${java.home}/bin/java" /> - <arg line="-application org.eclipse.equinox.p2.director" /> - <arg line="-consoleLog" /> - <arg line="-flavor tooling" /> - <arg line="-installIUs ${extraIU}" /> - <arg line="-p2.os ${os}" /> - <arg line="-p2.ws ${ws}" /> - <arg line="-p2.arch ${arch}" /> - <arg line="-roaming" /> - <arg line="-profile SDKProfile" /> - <arg line="-repository ${currentBuildRepo}" /> - <arg line="-destination ${eclipse-home}" /> - <arg line="-bundlepool ${eclipse-home}" /> - </java> - </target> - - <target name="installTestPlugins"> - <path id="launcher.paths"> - <fileset dir="${eclipse-home}" includes="plugins/org.eclipse.equinox.launcher_*" /> - </path> - <property name="launcherPath" refid="launcher.paths" /> - <antcall target="setupPlatform" /> - <echo>-installIU ${testPlugin} +</echo> - <java jar="${launcherPath}" failonerror="false" dir="${eclipse-home}" timeout="900000" fork="true" output="${basedir}/director.log" resultproperty="directorcode"> - <arg line="-vm ${java.home}/bin/java" /> - <arg line="-application org.eclipse.equinox.p2.director" /> - <arg line="-consoleLog" /> - <arg line="-flavor tooling" /> - <arg line="-installIUs ${testPlugin},org.eclipse.test,org.eclipse.ant.optional.junit,org.eclipse.test.performance,org.eclipse.test.performance.win32,org.easymock" /> - <arg line="-p2.os ${os}" /> - <arg line="-p2.ws ${ws}" /> - <arg line="-p2.arch ${arch}" /> - <arg line="-roaming" /> - <arg line="-profile SDKProfile" /> - <arg line="-repository file:${repoLocation}" /> - <arg line="-destination ${eclipse-home}" /> - <arg line="-bundlepool ${eclipse-home}" /> - </java> - <antcall target="configureTeamTest" /> - <antcall target="unzipderby" /> - </target> - - - <target name="unzipderby" if="derby"> - <exec dir="." executable="unzip"> - <arg line="-o eclipse-junit-tests-*.zip ${derby} -d ${install}" /> - </exec> - <copy todir="${install}/eclipse/dropins/eclipse/plugins"> - <fileset dir="${repoLocation}/eclipse/dropins/eclipse/plugins" includes="org.apache.derby**/*" /> - </copy> - </target> - - <target name="init" depends="setRuntimeArchive"> - <mkdir dir="${results}/xml" /> - <mkdir dir="${results}/html" /> - <mkdir dir="${junit-report-output}" /> + <target + name="platform-tar.gz" + description="Reinstall the test Eclipse installation if specified by user"> + <delete dir="${platformLocation}" /> + <mkdir dir="${platformLocation}" /> + <exec + dir="${platformLocation}" + executable="tar"> + <arg line="-xzf ${platformArchive}" /> + </exec> + </target> + + <target + name="installExtraPlugins" + if="extraIU"> + <property file="equinoxp2tests.properties" /> + <path id="launcher.paths"> + <fileset + dir="${eclipse-home}" + includes="plugins/org.eclipse.equinox.launcher_*" /> + </path> + <property + name="launcherPath" + refid="launcher.paths" /> + + <property + name="currentBuildRepo" + value="${org.eclipse.equinox.p2.tests.current.build.repo}" /> + <echo>-installIU ${extraIU} +</echo> + <java + jar="${launcherPath}" + failonerror="false" + dir="${eclipse-home}" + timeout="900000" + fork="true" + output="${basedir}/director.log" + resultproperty="directorcode"> + <arg line="-vm ${java.home}/bin/java" /> + <arg line="-application org.eclipse.equinox.p2.director" /> + <arg line="-consoleLog" /> + <arg line="-flavor tooling" /> + <arg line="-installIUs ${extraIU}" /> + <arg line="-p2.os ${os}" /> + <arg line="-p2.ws ${ws}" /> + <arg line="-p2.arch ${arch}" /> + <arg line="-roaming" /> + <arg line="-profile SDKProfile" /> + <arg line="-repository ${currentBuildRepo}" /> + <arg line="-destination ${eclipse-home}" /> + <arg line="-bundlepool ${eclipse-home}" /> + </java> + </target> + + <target name="installTestPlugins"> + <path id="launcher.paths"> + <fileset + dir="${eclipse-home}" + includes="plugins/org.eclipse.equinox.launcher_*" /> + </path> + <property + name="launcherPath" + refid="launcher.paths" /> + <antcall target="setupPlatform" /> + <echo>-installIU ${testPlugin} +</echo> + <java + jar="${launcherPath}" + failonerror="false" + dir="${eclipse-home}" + timeout="900000" + fork="true" + output="${basedir}/director.log" + resultproperty="directorcode"> + <arg line="-vm ${java.home}/bin/java" /> + <arg line="-application org.eclipse.equinox.p2.director" /> + <arg line="-consoleLog" /> + <arg line="-flavor tooling" /> + <arg + line="-installIUs ${testPlugin},org.eclipse.test,org.eclipse.ant.optional.junit,org.eclipse.test.performance,org.eclipse.test.performance.win32,org.easymock" /> + <arg line="-p2.os ${os}" /> + <arg line="-p2.ws ${ws}" /> + <arg line="-p2.arch ${arch}" /> + <arg line="-roaming" /> + <arg line="-profile SDKProfile" /> + <arg line="-repository file:${repoLocation}" /> + <arg line="-destination ${eclipse-home}" /> + <arg line="-bundlepool ${eclipse-home}" /> + </java> + <antcall target="configureTeamTest" /> + <antcall target="unzipderby" /> + </target> + + + <target + name="unzipderby" + if="derby" + unless="skipDerby"> + <exec + dir="." + executable="unzip"> + <arg line="-o eclipse-junit-tests-*.zip ${derby} -d ${install}" /> + </exec> + <copy todir="${install}/eclipse/dropins/eclipse/plugins"> + <fileset + dir="${repoLocation}/eclipse/dropins/eclipse/plugins" + includes="org.apache.derby**/*" /> + </copy> + </target> + + <target + name="init" + depends="setRuntimeArchive"> + <mkdir dir="${results}/xml" /> + <mkdir dir="${results}/html" /> + <mkdir dir="${junit-report-output}" /> <!--Unlock files on the Mac before starting tests. Required to delete some workspace directories (org.eclipse.core.filebuffers.tests and Team CVS tests).--> - <exec dir="${basedir}" executable="chflags" os="Mac OS X"> - <arg line="-R nouchg ${install}" /> - </exec> - </target> - - <target name="setRuntimeArchive"> - <echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" /> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-win32.zip"> - <and> - <equals arg1="${os}" arg2="win32" /> - <equals arg1="${ws}" arg2="win32" /> - <equals arg1="${arch}" arg2="x86" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-win32-x86_64.zip"> - <and> - <equals arg1="${os}" arg2="win32" /> - <equals arg1="${ws}" arg2="win32" /> - <equals arg1="${arch}" arg2="x86_64" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-linux-gtk.tar.gz"> - <and> - <equals arg1="${os}" arg2="linux" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="x86" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz"> - <and> - <equals arg1="${os}" arg2="linux" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="ppc64" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz"> - <and> - <equals arg1="${os}" arg2="linux" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="x86_64" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-macosx-cocoa-ppc.tar.gz"> - <and> - <equals arg1="${os}" arg2="macosx" /> - <equals arg1="${ws}" arg2="cocoa" /> - <equals arg1="${arch}" arg2="ppc" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz"> - <and> - <equals arg1="${os}" arg2="macosx" /> - <equals arg1="${ws}" arg2="cocoa" /> - <equals arg1="${arch}" arg2="x86" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz"> - <and> - <equals arg1="${os}" arg2="macosx" /> - <equals arg1="${ws}" arg2="cocoa" /> - <equals arg1="${arch}" arg2="x86_64" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-hpux-gtk.zip"> - <and> - <equals arg1="${os}" arg2="hpux" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="ia64_32" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-solaris-gtk.zip"> - <and> - <equals arg1="${os}" arg2="solaris" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="sparc" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-solaris-gtk-x86.zip"> - <and> - <equals arg1="${os}" arg2="solaris" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="x86" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-aix-gtk-ppc.zip"> - <and> - <equals arg1="${os}" arg2="aix" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="ppc" /> - </and> - </condition> - <condition property="runtimeArchive" value="eclipse-SDK-${buildId}-aix-gtk-ppc64.zip"> - <and> - <equals arg1="${os}" arg2="aix" /> - <equals arg1="${ws}" arg2="gtk" /> - <equals arg1="${arch}" arg2="ppc64" /> - </and> - </condition> - <echo message="runtimeArchive ${runtimeArchive} !!! " /> - </target> - - <target name="setJVMProperties" depends="setJVMfromUserSpecified"> + <exec + dir="${basedir}" + executable="chflags" + os="Mac OS X"> + <arg line="-R nouchg ${install}" /> + </exec> + </target> + + <target name="setRuntimeArchive"> + <echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" /> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-win32.zip"> + <and> + <equals + arg1="${os}" + arg2="win32" /> + <equals + arg1="${ws}" + arg2="win32" /> + <equals + arg1="${arch}" + arg2="x86" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-win32-x86_64.zip"> + <and> + <equals + arg1="${os}" + arg2="win32" /> + <equals + arg1="${ws}" + arg2="win32" /> + <equals + arg1="${arch}" + arg2="x86_64" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-linux-gtk.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="linux" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="x86" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="linux" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="ppc64" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="linux" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="x86_64" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-macosx-cocoa-ppc.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="macosx" /> + <equals + arg1="${ws}" + arg2="cocoa" /> + <equals + arg1="${arch}" + arg2="ppc" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="macosx" /> + <equals + arg1="${ws}" + arg2="cocoa" /> + <equals + arg1="${arch}" + arg2="x86" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz"> + <and> + <equals + arg1="${os}" + arg2="macosx" /> + <equals + arg1="${ws}" + arg2="cocoa" /> + <equals + arg1="${arch}" + arg2="x86_64" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-hpux-gtk.zip"> + <and> + <equals + arg1="${os}" + arg2="hpux" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="ia64_32" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-solaris-gtk.zip"> + <and> + <equals + arg1="${os}" + arg2="solaris" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="sparc" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-solaris-gtk-x86.zip"> + <and> + <equals + arg1="${os}" + arg2="solaris" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="x86" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-aix-gtk-ppc.zip"> + <and> + <equals + arg1="${os}" + arg2="aix" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="ppc" /> + </and> + </condition> + <condition + property="runtimeArchive" + value="eclipse-SDK-${buildId}-aix-gtk-ppc64.zip"> + <and> + <equals + arg1="${os}" + arg2="aix" /> + <equals + arg1="${ws}" + arg2="gtk" /> + <equals + arg1="${arch}" + arg2="ppc64" /> + </and> + </condition> + <echo message="runtimeArchive ${runtimeArchive} !!! " /> + </target> + + <target + name="setJVMProperties" + depends="setJVMfromUserSpecified"> <!--enable tests requiring 1.5 or 1.6 vms to run if running vm level detected matches required execution environment--> - <condition property="J2SE-5.0" value="${java.home}/bin/java"> - <or> - <or> - <equals arg1="${ant.java.version}" arg2="1.5" /> - <equals arg1="${ant.java.version}" arg2="1.6" /> - </or> - <equals arg1="${ant.java.version}" arg2="1.7" /> - </or> - </condition> - <condition property="J2SE-6.0" value="${java.home}/bin/java"> - <or> - <equals arg1="${ant.java.version}" arg2="1.6" /> - <equals arg1="${ant.java.version}" arg2="1.7" /> - </or> - </condition> - <condition property="J2SE-7.0" value="${java.home}/bin/java"> - <equals arg1="${ant.java.version}" arg2="1.7" /> - </condition> - </target> - <target name="setJVMfromUserSpecified" if="jvm"> - <exec executable="${jvm}" outputproperty="javaversion"> - <arg line="-version" /> - </exec> - <echo message="java version of ${jvm} is ${javaversion}" /> - <condition property="J2SE-7.0" value="${jvm}"> - <contains string="${javaversion}" substring="java version "1.7" /> - </condition> - <condition property="J2SE-6.0" value="${jvm}"> - <or> - <contains string="${javaversion}" substring="java version "1.6" /> - <contains string="${javaversion}" substring="java version "1.7" /> - </or> - </condition> - <condition property="J2SE-5.0" value="${jvm}"> - <or> - <or> - <contains string="${javaversion}" substring="java version "1.7" /> - <contains string="${javaversion}" substring="java version "1.6" /> - </or> - <contains string="${javaversion}" substring="java version "1.5" /> - </or> - </condition> - <echo message="J2SE-7.0: ${J2SE-7.0}" /> - <echo message="J2SE-6.0: ${J2SE-6.0}" /> - <echo message="J2SE-5.0: ${J2SE-5.0}" /> - </target> - <target name="configureTeamTest" if="teamcvs"> + <condition + property="J2SE-5.0" + value="${java.home}/bin/java"> + <or> + <or> + <equals + arg1="${ant.java.version}" + arg2="1.5" /> + <equals + arg1="${ant.java.version}" + arg2="1.6" /> + </or> + <equals + arg1="${ant.java.version}" + arg2="1.7" /> + </or> + </condition> + <condition + property="J2SE-6.0" + value="${java.home}/bin/java"> + <or> + <equals + arg1="${ant.java.version}" + arg2="1.6" /> + <equals + arg1="${ant.java.version}" + arg2="1.7" /> + </or> + </condition> + <condition + property="J2SE-7.0" + value="${java.home}/bin/java"> + <equals + arg1="${ant.java.version}" + arg2="1.7" /> + </condition> + </target> + <target + name="setJVMfromUserSpecified" + if="jvm"> + <exec + executable="${jvm}" + outputproperty="javaversion"> + <arg line="-version" /> + </exec> + <echo message="java version of ${jvm} is ${javaversion}" /> + <condition + property="J2SE-7.0" + value="${jvm}"> + <contains + string="${javaversion}" + substring="java version "1.7" /> + </condition> + <condition + property="J2SE-6.0" + value="${jvm}"> + <or> + <contains + string="${javaversion}" + substring="java version "1.6" /> + <contains + string="${javaversion}" + substring="java version "1.7" /> + </or> + </condition> + <condition + property="J2SE-5.0" + value="${jvm}"> + <or> + <or> + <contains + string="${javaversion}" + substring="java version "1.7" /> + <contains + string="${javaversion}" + substring="java version "1.6" /> + </or> + <contains + string="${javaversion}" + substring="java version "1.5" /> + </or> + </condition> + <echo message="J2SE-7.0: ${J2SE-7.0}" /> + <echo message="J2SE-6.0: ${J2SE-6.0}" /> + <echo message="J2SE-5.0: ${J2SE-5.0}" /> + </target> + <target + name="configureTeamTest" + if="teamcvs"> <!-- Fill in cvs repository information --> - <replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="${cvs_user}" /> - <replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="${cvs_password}" /> - <replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="${cvs_host}" /> - <replace file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="${cvs_root}" /> - </target> - - <target name="configureDeltaPack" if="pdebuild"> - <property name="deltapackArchive" value="eclipse-${buildId}-delta-pack.zip" /> - <property name="installDeltapack" value="${install}/deltapack" /> - <mkdir dir="${installDeltapack}" /> - <exec dir="." executable="unzip"> - <arg line="-o -qq ${deltapackArchive} -d ${installDeltapack}" /> - </exec> - </target> - - - <macrodef name="runTests"> - <attribute name="testPlugin" /> - <sequential> - + <replace + file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" + token="@user@" + value="${cvs_user}" /> + <replace + file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" + token="@password@" + value="${cvs_password}" /> + <replace + file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" + token="@host@" + value="${cvs_host}" /> + <replace + file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" + token="@root@" + value="${cvs_root}" /> + </target> + + <target + name="configureDeltaPack" + if="pdebuild"> + <property + name="deltapackArchive" + value="eclipse-${buildId}-delta-pack.zip" /> + <property + name="installDeltapack" + value="${install}/deltapack" /> + <mkdir dir="${installDeltapack}" /> + <exec + dir="." + executable="unzip"> + <arg line="-o -qq ${deltapackArchive} -d ${installDeltapack}" /> + </exec> + </target> + + + <macrodef name="runTests"> + <attribute name="testPlugin" /> + <sequential> + <antcall target="markCurrentTime"> + <param + name="message" + value="start @{testPlugin}" /> + </antcall> <!--alwasy use eclipse executable to launch tests with the exception of performance tests--> <!--condition property="useEclipseExe" value="true"> <not> @@ -406,437 +744,712 @@ </not> </condition--> - <condition property="performance.target.present" value="true"> - <isset property="@{testPlugin}.has.performance.target" /> - </condition> + <condition + property="performance.target.present" + value="true"> + <isset property="@{testPlugin}.has.performance.target" /> + </condition> <!--override the value of this property with performance if the tests run on performance machine--> - <property name="test.target" value="junit" /> - <property name="report" value="@{testPlugin}" /> + <property + name="test.target" + value="junit" /> + <property + name="report" + value="@{testPlugin}" /> <!--install db plug-ins if running performance tests--> - <condition property="derby" value="eclipse/dropins/eclipse/plugins/org.apache.derby*/**"> - <equals arg1="${test.target}" arg2="performance" /> - </condition> + <condition + property="derby" + value="eclipse/dropins/eclipse/plugins/org.apache.derby*/**"> + <equals + arg1="${test.target}" + arg2="performance" /> + </condition> <!-- <property name="derby" value="" /> --> <!-- <param name="testPlugin" value="${@{testPlugin}}" /> --> - <antcall target="${test.target}"> - <param name="testPlugin" value="@{testPlugin}" /> - <param name="output-file" value="@{testPlugin}.xml" /> - </antcall> - </sequential> - </macrodef> - - <target name="junit" unless="skip.test"> - <antcall target="setup"> - </antcall> - <property file="finalPluginsVersions.properties" /> - <property name="library-file" value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" /> - <property name="junit-stylesheet" value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> - <echo>trying to find ${testPlugin}_*</echo> - <fileset id="test.plugin.file" dir="${eclipse-home}/plugins"> - <filename name="${testPlugin}_*/test.xml" /> - </fileset> - <property name="testPluginX" refid="test.plugin.file" /> - <echo>trying to find ${testPluginX}</echo> - <condition property="pluginexists" value="true"> - <not> - <equals arg1="${testPluginX}" arg2="" /> - </not> - </condition> - <antcall target="runSuite" /> - <antcall target="genResults" /> - </target> - - <target name="runSuite" if="pluginexists"> - <ant antfile="${eclipse-home}/plugins/${testPluginX}" dir="${eclipse-home}" /> - </target> - - - <target name="runSuitePerf" if="pluginexists"> - <echo message="testPluginX ${testPluginX}" /> - <property name="junit-stylesheet" value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> - <ant antfile="${eclipse-home}/plugins/${testPluginX}" dir="${eclipse-home}" target="performance" /> - </target> - - <target name="performance" if="performance.target.present" unless="skip.test"> - <antcall target="setup" /> - <property file="finalPluginsVersions.properties" /> - <property name="library-file" value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" /> - - <echo>trying to find ${testPlugin}_*</echo> - <fileset id="test.plugin.file" dir="${eclipse-home}/plugins"> - <filename name="${testPlugin}_*/test.xml" /> - </fileset> - <property name="testPluginX" refid="test.plugin.file" /> - <echo>trying to find ${testPluginX}</echo> - <condition property="pluginexists" value="true"> - <not> - <equals arg1="${testPluginX}" arg2="" /> - </not> - </condition> - <antcall target="runSuitePerf" /> - <antcall target="genResults" /> - </target> - - <target name="genResults"> - <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" /> - <property name="junit-stylesheet" value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> - <xslt style="${junit-stylesheet}" basedir="${results}/xml" destdir="${results}/html" /> - </target> - - <target name="ant"> - <runTests testPlugin="org.eclipse.ant.tests.core" /> - </target> - - <target name="antui"> - <runTests testPlugin="org.eclipse.ant.tests.ui" /> - </target> - - <target name="compare"> - <runTests testPlugin="org.eclipse.compare.tests" /> - </target> - - <target name="equinoxds"> - <runTests testPlugin="org.eclipse.equinox.ds.tests" /> - </target> - - <target name="debug"> - <runTests testPlugin="org.eclipse.debug.tests" /> - </target> - - <target name="coreresources"> - <runTests testPlugin="org.eclipse.core.tests.resources" /> - </target> - - <target name="coreruntime"> - <runTests testPlugin="org.eclipse.core.tests.runtime" /> - </target> - - <target name="osgi"> - <runTests testPlugin="org.eclipse.osgi.tests" /> - </target> - - <target name="coreexpressions"> - <runTests testPlugin="org.eclipse.core.expressions.tests" /> - </target> - - <target name="ltkuirefactoringtests"> - <runTests testPlugin="org.eclipse.ltk.ui.refactoring.tests" /> - </target> - - <target name="ltkcorerefactoringtests"> - <runTests testPlugin="org.eclipse.ltk.core.refactoring.tests" /> - </target> - - <target name="text"> - <runTests testPlugin="org.eclipse.text.tests" /> - </target> - - <target name="jface"> - <runTests testPlugin="org.eclipse.jface.text.tests" /> - </target> - - <target name="jfacedatabinding"> - <runTests testPlugin="org.eclipse.jface.tests.databinding" /> - </target> - - <target name="filebuffers"> - <runTests testPlugin="org.eclipse.core.filebuffers.tests" /> - </target> - - <target name="jdttext" unless="skip.jdttext"> - <runTests testPlugin="org.eclipse.jdt.text.tests" /> - </target> - - <target name="relEng" depends="setRuntimeArchive"> - <runTests testPlugin="org.eclipse.releng.tests" /> - <move todir="${results}/chkpii" includeEmptyDirs="no" failonerror="false"> - <fileset dir="${results}/chkpii" /> - <mapper type="glob" from="*" to="${platform}_*" /> - </move> - </target> - - <target name="ua"> - <runTests testPlugin="org.eclipse.ua.tests" /> - </target> - - <target name="uadoc"> - <runTests testPlugin="org.eclipse.ua.tests.doc" /> - </target> - - <target name="coretestsnet"> - <runTests testPlugin="org.eclipse.core.tests.net" /> - </target> - - <target name="jdtcorecompiler" depends="setJVMProperties"> - <condition property="jvm" value="${J2SE-5.0}"> - <isset property="J2SE-5.0" /> - </condition> - <runTests testPlugin="org.eclipse.jdt.core.tests.compiler" /> - </target> - - <target name="jdtapt" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-5.0}" /> + <antcall target="${test.target}"> + <param + name="testPlugin" + value="@{testPlugin}" /> + <param + name="output-file" + value="@{testPlugin}.xml" /> + </antcall> + <antcall target="markCurrentTime"> + <param + name="message" + value="end @{testPlugin}" /> + </antcall> + </sequential> + </macrodef> + + <target + name="junit" + unless="skip.test"> + <antcall target="setup"> + </antcall> + <property file="finalPluginsVersions.properties" /> + <property + name="library-file" + value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" /> + <property + name="junit-stylesheet" + value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> + <echo>trying to find ${testPlugin}_*</echo> + <fileset + id="test.plugin.file" + dir="${eclipse-home}/plugins"> + <filename name="${testPlugin}_*/test.xml" /> + </fileset> + <property + name="testPluginX" + refid="test.plugin.file" /> + <echo>trying to find ${testPluginX}</echo> + <condition + property="pluginexists" + value="true"> + <not> + <equals + arg1="${testPluginX}" + arg2="" /> + </not> + </condition> + <antcall target="runSuite" /> + <antcall target="genResults" /> + </target> + + <target + name="runSuite" + if="pluginexists"> + <ant + antfile="${eclipse-home}/plugins/${testPluginX}" + dir="${eclipse-home}" /> + </target> + + + <target + name="runSuitePerf" + if="pluginexists"> + <echo message="testPluginX ${testPluginX}" /> + <property + name="junit-stylesheet" + value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> + <ant + antfile="${eclipse-home}/plugins/${testPluginX}" + dir="${eclipse-home}" + target="performance" /> + </target> + + <target + name="performance" + if="performance.target.present" + unless="skip.test"> + <antcall target="setup" /> + <property file="finalPluginsVersions.properties" /> + <property + name="library-file" + value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" /> + + <echo>trying to find ${testPlugin}_*</echo> + <fileset + id="test.plugin.file" + dir="${eclipse-home}/plugins"> + <filename name="${testPlugin}_*/test.xml" /> + </fileset> + <property + name="testPluginX" + refid="test.plugin.file" /> + <echo>trying to find ${testPluginX}</echo> + <condition + property="pluginexists" + value="true"> + <not> + <equals + arg1="${testPluginX}" + arg2="" /> + </not> + </condition> + <antcall target="runSuitePerf" /> + <antcall target="genResults" /> + </target> + + <target name="genResults"> + <copy + file="${eclipse-home}/${report}.xml" + tofile="${results}/xml/${report}_${platform}.xml" + failonerror="false" /> + <property + name="junit-stylesheet" + value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" /> + <xslt + style="${junit-stylesheet}" + basedir="${results}/xml" + destdir="${results}/html" /> + </target> + + <target name="ant"> + <runTests testPlugin="org.eclipse.ant.tests.core" /> + </target> + + <target name="antui"> + <runTests testPlugin="org.eclipse.ant.tests.ui" /> + </target> + + <target name="compare"> + <runTests testPlugin="org.eclipse.compare.tests" /> + </target> + + <target name="equinoxds"> + <runTests testPlugin="org.eclipse.equinox.ds.tests" /> + </target> + + <target name="debug"> + <runTests testPlugin="org.eclipse.debug.tests" /> + </target> + + <target name="coreresources"> + <runTests testPlugin="org.eclipse.core.tests.resources" /> + </target> + + <target name="coreruntime"> + <runTests testPlugin="org.eclipse.core.tests.runtime" /> + </target> + + <target name="osgi"> + <runTests testPlugin="org.eclipse.osgi.tests" /> + </target> + + <target name="coreexpressions"> + <runTests testPlugin="org.eclipse.core.expressions.tests" /> + </target> + + <target name="ltkuirefactoringtests"> + <runTests testPlugin="org.eclipse.ltk.ui.refactoring.tests" /> + </target> + + <target name="ltkcorerefactoringtests"> + <runTests testPlugin="org.eclipse.ltk.core.refactoring.tests" /> + </target> + + <target name="text"> + <runTests testPlugin="org.eclipse.text.tests" /> + </target> + + <target name="jface"> + <runTests testPlugin="org.eclipse.jface.text.tests" /> + </target> + + <target name="jfacedatabinding"> + <runTests testPlugin="org.eclipse.jface.tests.databinding" /> + </target> + + <target name="filebuffers"> + <runTests testPlugin="org.eclipse.core.filebuffers.tests" /> + </target> + + <target + name="jdttext" + unless="skip.jdttext"> + <runTests testPlugin="org.eclipse.jdt.text.tests" /> + </target> + + <target + name="relEng" + depends="setRuntimeArchive"> + <runTests testPlugin="org.eclipse.releng.tests" /> + <move + todir="${results}/chkpii" + includeEmptyDirs="no" + failonerror="false"> + <fileset dir="${results}/chkpii" /> + <mapper + type="glob" + from="*" + to="${platform}_*" /> + </move> + </target> + + <target name="ua"> + <runTests testPlugin="org.eclipse.ua.tests" /> + </target> + + <target name="uadoc"> + <runTests testPlugin="org.eclipse.ua.tests.doc" /> + </target> + + <target name="coretestsnet"> + <runTests testPlugin="org.eclipse.core.tests.net" /> + </target> + + <target + name="jdtcorecompiler" + depends="setJVMProperties"> + <condition + property="jvm" + value="${J2SE-5.0}"> + <isset property="J2SE-5.0" /> + </condition> + <runTests testPlugin="org.eclipse.jdt.core.tests.compiler" /> + </target> + + <target + name="jdtapt" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-5.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <isset property="J2SE-5.0" /> - </not> - </condition> - <runTests testPlugin="org.eclipse.jdt.apt.tests" /> - </target> - - <target name="jdtaptpluggable" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-6.0}" /> + <condition property="skip.test"> + <not> + <isset property="J2SE-5.0" /> + </not> + </condition> + <runTests testPlugin="org.eclipse.jdt.apt.tests" /> + </target> + + <target + name="jdtaptpluggable" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-6.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <or> - <isset property="J2SE-6.0" /> - <isset property="J2SE-7.0" /> - </or> - </not> - </condition> - <runTests testPlugin="org.eclipse.jdt.apt.pluggable.tests" /> - </target> - - - <target name="jdtcorebuilder" depends="setJVMProperties"> + <condition property="skip.test"> + <not> + <or> + <isset property="J2SE-6.0" /> + <isset property="J2SE-7.0" /> + </or> + </not> + </condition> + <runTests testPlugin="org.eclipse.jdt.apt.pluggable.tests" /> + </target> + + + <target + name="jdtcorebuilder" + depends="setJVMProperties"> <!--Run with 1.5 vm if it is available--> - <condition property="jvm" value="${J2SE-5.0}"> - <isset property="J2SE-5.0" /> - </condition> - <runTests testPlugin="org.eclipse.jdt.core.tests.builder" /> - </target> - - <target name="jdtcompilertool" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-6.0}" /> + <condition + property="jvm" + value="${J2SE-5.0}"> + <isset property="J2SE-5.0" /> + </condition> + <runTests testPlugin="org.eclipse.jdt.core.tests.builder" /> + </target> + + <target + name="jdtcompilertool" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-6.0}" /> <!--only run test if J2SE-6.0 property set--> - <condition property="skip.test"> - <not> - <or> - <isset property="J2SE-6.0" /> - <isset property="J2SE-7.0" /> - </or> - </not> - </condition> - <runTests testPlugin="org.eclipse.jdt.compiler.tool.tests" /> - </target> - - <target name="jdtcompilerapt" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-6.0}" /> + <condition property="skip.test"> + <not> + <or> + <isset property="J2SE-6.0" /> + <isset property="J2SE-7.0" /> + </or> + </not> + </condition> + <runTests testPlugin="org.eclipse.jdt.compiler.tool.tests" /> + </target> + + <target + name="jdtcompilerapt" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-6.0}" /> <!--only run test if J2SE-6.0 property set--> - <condition property="skip.test"> - <not> - <or> - <isset property="J2SE-6.0" /> - <isset property="J2SE-7.0" /> - </or> - </not> - </condition> - <runTests testPlugin="org.eclipse.jdt.compiler.apt.tests" /> - </target> - - <target name="jdtcoremodel" depends="setJVMProperties"> - <condition property="jvm" value="${J2SE-5.0}"> - <isset property="J2SE-5.0" /> - </condition> - <runTests testPlugin="org.eclipse.jdt.core.tests.model" /> - </target> - - <target name="jdtcoreperf"> - <runTests testPlugin="org.eclipse.jdt.core.tests.performance" /> - </target> - - <target name="jdtdebug"> - <runTests testPlugin="org.eclipse.jdt.debug.tests" /> - </target> - - <target name="jdtui"> - <runTests testPlugin="org.eclipse.jdt.ui.tests" /> - </target> - - <target name="jdtuirefactoring"> - <runTests testPlugin="org.eclipse.jdt.ui.tests.refactoring" /> - </target> - - <target name="pdeui"> - <runTests testPlugin="org.eclipse.pde.ui.tests" /> - </target> - - <target name="pdebuild"> - <property name="pdebuild" value="true" /> - <runTests testPlugin="org.eclipse.pde.build.tests" /> - </target> - - <target name="swt"> - <runTests testPlugin="org.eclipse.swt.tests" /> - </target> - - <target name="teamcore"> - <runTests testPlugin="org.eclipse.team.tests.core" /> - </target> - - <target name="teamcvs"> - <property name="teamcvs" value="true" /> - <runTests testPlugin="org.eclipse.team.tests.cvs.core" /> - </target> - - <target name="ui"> - <runTests testPlugin="org.eclipse.ui.tests" /> - </target> - - <target name="uinavigator"> - <runTests testPlugin="org.eclipse.ui.tests.navigator" /> - </target> - - <target name="uircp"> - <runTests testPlugin="org.eclipse.ui.tests.rcp" /> - </target> - - <target name="uiforms"> - <runTests testPlugin="org.eclipse.ui.tests.forms" /> - </target> - - <target name="uieditors"> - <runTests testPlugin="org.eclipse.ui.editors.tests" /> - </target> - - <target name="uiperformance"> - <runTests testPlugin="org.eclipse.ui.tests.performance" /> - </target> - - <target name="uiviews"> - <runTests testPlugin="org.eclipse.ui.tests.views.properties.tabbed" /> - </target> - - <target name="uiworkbenchtexteditor"> - <runTests testPlugin="org.eclipse.ui.workbench.texteditor.tests" /> - </target> - - <target name="update"> - <runTests testPlugin="org.eclipse.update.tests.core" /> - </target> - - <target name="pdeapitooling" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-5.0}" /> + <condition property="skip.test"> + <not> + <or> + <isset property="J2SE-6.0" /> + <isset property="J2SE-7.0" /> + </or> + </not> + </condition> + <runTests testPlugin="org.eclipse.jdt.compiler.apt.tests" /> + </target> + + <target + name="jdtcoremodel" + depends="setJVMProperties"> + <condition + property="jvm" + value="${J2SE-5.0}"> + <isset property="J2SE-5.0" /> + </condition> + <runTests testPlugin="org.eclipse.jdt.core.tests.model" /> + </target> + + <target name="jdtcoreperf"> + <runTests testPlugin="org.eclipse.jdt.core.tests.performance" /> + </target> + + <target name="jdtdebug"> + <runTests testPlugin="org.eclipse.jdt.debug.tests" /> + </target> + + <target name="jdtui"> + <runTests testPlugin="org.eclipse.jdt.ui.tests" /> + </target> + + <target name="jdtuirefactoring"> + <runTests testPlugin="org.eclipse.jdt.ui.tests.refactoring" /> + </target> + + <target name="pdeui"> + <runTests testPlugin="org.eclipse.pde.ui.tests" /> + </target> + + <target name="pdebuild"> + <property + name="pdebuild" + value="true" /> + <runTests testPlugin="org.eclipse.pde.build.tests" /> + </target> + + <target name="swt"> + <runTests testPlugin="org.eclipse.swt.tests" /> + </target> + + <target name="teamcore"> + <runTests testPlugin="org.eclipse.team.tests.core" /> + </target> + + <target name="teamcvs"> + <property + name="teamcvs" + value="true" /> + <runTests testPlugin="org.eclipse.team.tests.cvs.core" /> + </target> + + <target name="ui"> + <runTests testPlugin="org.eclipse.ui.tests" /> + </target> + + <target name="uinavigator"> + <runTests testPlugin="org.eclipse.ui.tests.navigator" /> + </target> + + <target name="uircp"> + <runTests testPlugin="org.eclipse.ui.tests.rcp" /> + </target> + + <target name="uiforms"> + <runTests testPlugin="org.eclipse.ui.tests.forms" /> + </target> + + <target name="uieditors"> + <runTests testPlugin="org.eclipse.ui.editors.tests" /> + </target> + + <target name="uiperformance"> + <runTests testPlugin="org.eclipse.ui.tests.performance" /> + </target> + + <target name="uiviews"> + <runTests testPlugin="org.eclipse.ui.tests.views.properties.tabbed" /> + </target> + + <target name="uiworkbenchtexteditor"> + <runTests testPlugin="org.eclipse.ui.workbench.texteditor.tests" /> + </target> + + <target name="update"> + <runTests testPlugin="org.eclipse.update.tests.core" /> + </target> + + <target + name="pdeapitooling" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-5.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <isset property="J2SE-5.0" /> - </not> - </condition> - <runTests testPlugin="org.eclipse.pde.api.tools.tests" /> - </target> - - <target name="equinoxsecurity"> - <runTests testPlugin="org.eclipse.equinox.security.tests" /> - </target> - - <target name="equinoxp2" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-5.0}" /> + <condition property="skip.test"> + <not> + <isset property="J2SE-5.0" /> + </not> + </condition> + <runTests testPlugin="org.eclipse.pde.api.tools.tests" /> + </target> + + <target name="equinoxsecurity"> + <runTests testPlugin="org.eclipse.equinox.security.tests" /> + </target> + + <!-- + disable this tests for mac, for now, since always DNSs. See + https://bugs.eclipse.org/bugs/show_bug.cgi?id=390392 + --> + <target + name="equinoxp2" + depends="setJVMProperties, checkOS" + unless="isMac"> + <property + name="jvm" + value="${J2SE-5.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <isset property="J2SE-5.0" /> - </not> - </condition> - <runTests testPlugin="org.eclipse.equinox.p2.tests" /> - </target> - - <target name="equinoxp2ui" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-5.0}" /> + <condition property="skip.test"> + <not> + <isset property="J2SE-5.0" /> + </not> + </condition> + <runTests testPlugin="org.eclipse.equinox.p2.tests" /> + </target> + + <!-- + disable this tests for mac, for now, since always DNSs. See + https://bugs.eclipse.org/bugs/show_bug.cgi?id=390392 + --> + <target + name="equinoxp2ui" + depends="setJVMProperties, checkOS" + unless="isMac"> + <property + name="jvm" + value="${J2SE-5.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <isset property="J2SE-5.0" /> - </not> - </condition> - <runTests testPlugin="org.eclipse.equinox.p2.tests.ui" /> - </target> - - <target name="equinoxp2discovery" depends="setJVMProperties"> - <property name="jvm" value="${J2SE-5.0}" /> + <condition property="skip.test"> + <not> + <isset property="J2SE-5.0" /> + </not> + </condition> + <runTests testPlugin="org.eclipse.equinox.p2.tests.ui" /> + </target> + + <target + name="equinoxp2discovery" + depends="setJVMProperties"> + <property + name="jvm" + value="${J2SE-5.0}" /> <!--only run test if J2SE-5.0 property set--> - <condition property="skip.test"> - <not> - <isset property="J2SE-5.0" /> - </not> - </condition> - <runTests testPlugin="org.eclipse.equinox.p2.tests.discovery" /> - </target> - - <target name="search"> - <runTests testPlugin="org.eclipse.search.tests" /> - </target> - - <target name="pdeds"> - <runTests testPlugin="org.eclipse.pde.ds.tests" /> - </target> - - <target name="bidi"> - <runTests testPlugin="org.eclipse.equinox.bidi.tests" /> - </target> - - - - - - <target name="all"> - <antcall target="equinoxp2" /> - <antcall target="equinoxp2ui" /> - <antcall target="pdeui" /> - <antcall target="jdtcompilertool" /> - <antcall target="jdtcompilerapt" /> - <antcall target="jdttext" /> - <antcall target="ant" /> - <antcall target="compare" /> - <antcall target="coreruntime" /> - <antcall target="coreresources" /> - <antcall target="osgi" /> - <antcall target="coreexpressions" /> - <antcall target="teamcore" /> - <antcall target="jdtcoreperf" /> - <antcall target="jdtcorebuilder" /> - <antcall target="jdtcorecompiler" /> - <antcall target="uiperformance" /> - <antcall target="uieditors" /> - <antcall target="uinavigator" /> - <antcall target="uiworkbenchtexteditor" /> - <antcall target="uircp" /> - <antcall target="uiviews" /> - <antcall target="jdtdebug" /> - <antcall target="jdtui" /> - <antcall target="jdtuirefactoring" /> - <antcall target="ltkuirefactoringtests" /> - <antcall target="ltkcorerefactoringtests" /> - <antcall target="text" /> - <antcall target="jface" /> - <antcall target="jfacedatabinding" /> - <antcall target="filebuffers" /> - <antcall target="antui" /> - <antcall target="coretestsnet" /> - <antcall target="jdtapt" /> - <antcall target="pdebuild" /> - <antcall target="jdtaptpluggable" /> - <antcall target="ua" /> - <antcall target="uiforms" /> - <antcall target="pdeapitooling" /> - <antcall target="equinoxsecurity" /> - <antcall target="search" /> - <antcall target="pdeds" /> - <antcall target="jdtcoremodel" /> - <antcall target="uadoc" /> - <antcall target="debug" /> - <antcall target="ui" /> - <antcall target="relEng" /> - <antcall target="swt" /> - <antcall target="teamcvs" /> - <antcall target="equinoxds" /> - <antcall target="equinoxp2discovery" /> - <antcall target="bidi" /> - - </target> + <condition property="skip.test"> + <not> + <isset property="J2SE-5.0" /> + </not> + </condition> + <runTests testPlugin="org.eclipse.equinox.p2.tests.discovery" /> + </target> + + <target name="search"> + <runTests testPlugin="org.eclipse.search.tests" /> + </target> + + <target name="pdeds"> + <runTests testPlugin="org.eclipse.pde.ds.tests" /> + </target> + + <target name="bidi"> + <runTests testPlugin="org.eclipse.equinox.bidi.tests" /> + </target> + + <target name="all"> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start relEng" /> + </antcall> + <antcall target="relEng" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end relEng" /> + </antcall> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start platform" /> + </antcall> + <antcall target="platform" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end platform" /> + </antcall> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start pde" /> + </antcall> + <antcall target="pde" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end pde" /> + </antcall> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start jdt" /> + </antcall> + <antcall target="jdt" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end jdt" /> + </antcall> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start platformLR" /> + </antcall> + <antcall target="platformLR" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end platformLR" /> + </antcall> + + <antcall target="markCurrentTime"> + <param + name="message" + value="start longrunning" /> + </antcall> + <antcall target="longrunning" /> + <antcall target="markCurrentTime"> + <param + name="message" + value="end longrunning" /> + </antcall> + + </target> + + <!-- + admittedly, not quite all of 'platform', but for + now serves dual purpose of a "short set" of tests, that area + relatively quick, and realtively reliable on build.eclipse.org hardware + --> + <target name="platform"> + <antcall target="ant" /> + <antcall target="antui" /> + <antcall target="compare" /> + + <antcall target="coreruntime" /> + <antcall target="osgi" /> + <antcall target="coreresources" /> + <antcall target="coreexpressions" /> + <antcall target="coretestsnet" /> + <antcall target="text" /> + <antcall target="jfacedatabinding" /> + <antcall target="filebuffers" /> + <antcall target="teamcore" /> + <antcall target="uadoc" /> + <antcall target="uieditors" /> + <antcall target="uinavigator" /> + <antcall target="uiworkbenchtexteditor" /> + + + <!-- don't run now, for 4.2. See bug 380553. + <antcall target="uircp" /> + --> + + <antcall target="uiviews" /> + <antcall target="ua" /> + <antcall target="uiforms" /> + <antcall target="equinoxp2ui" /> + <antcall target="equinoxsecurity" /> + <antcall target="search" /> + <antcall target="debug" /> + <antcall target="ui" /> + <antcall target="equinoxds" /> + <antcall target="equinoxp2discovery" /> + <antcall target="bidi" /> + <antcall target="ltkuirefactoringtests" /> + <antcall target="ltkcorerefactoringtests" /> + </target> + + <!-- this group is "platform tests" that are Long Running (or, perhaps + hang, during performance testss + --> + <target name="platformLR"> + <antcall target="teamcvs" /> + <antcall target="jface" /> + <antcall target="swt" /> + <antcall target="uiperformance" /> + </target> + + <target name="pde"> + <antcall target="pdeapitooling" /> + <antcall target="pdeds" /> + <antcall target="pdebuild" /> + <antcall target="pdeui" /> + </target> + + <target name="jdt"> + <antcall target="jdtcompilertool" /> + <antcall target="jdtcompilerapt" /> + <antcall target="jdttext" /> + <antcall target="jdtcoreperf" /> + <antcall target="jdtcorebuilder" /> + <antcall target="jdtcorecompiler" /> + <antcall target="jdtdebug" /> + <antcall target="jdtui" /> + <antcall target="jdtuirefactoring" /> + <antcall target="jdtapt" /> + <antcall target="jdtaptpluggable" /> + <antcall target="jdtcoremodel" /> + </target> + + <target name="longrunning"> + <antcall target="equinoxp2" /> + </target> + + <!-- we could put other variables/os checks here, if needed --> + <target name="checkOS"> + <condition + property="isMac" + value="true"> + <os family="mac" /> + </condition> + <condition + property="isUnix" + value="true"> + <os family="unix" /> + </condition> + </target> + <macrodef name="markTime"> + <attribute name="msg" /> + <sequential> + <!-- + we write the message first, with no ${line.separator} so that the timestamp can + go on same line, and my side-effect writes an EOL + --> + <echo + message="@{msg} " + append="true" + file="${junit-report-output}/testTimes.log" /> + <!-- This executable should run on all unix platforms (linux, mac) --> + <exec + executable="date" + append="true" + output="${junit-report-output}/testTimes.log" + osfamily="unix"> + <arg value="+%s" /> + </exec> + </sequential> + </macrodef> + <target + name="markCurrentTime" + depends="checkOS" + if="isUnix"> + <!-- caller in callant is expected to supply msg --> + <property + name="message" + value="no message given by caller" /> + <markTime msg="${message}" /> + </target> + </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Entries b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Entries deleted file mode 100644 index c4c3b9b2b..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/readme.html/1.16/Tue Jun 7 13:22:45 2011/-kk/ -/runtests/1.34/Tue Jun 7 13:22:45 2011/-kb/ -/runtests.bat/1.10/Wed Jan 19 15:44:27 2011/-kk/ -/runtests.sh/1.7/Tue Jun 7 13:22:45 2011// -/test.xml/1.213/Fri Nov 11 14:59:52 2011/-kk/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Repository b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Repository deleted file mode 100644 index 533fddf26..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Root b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Root deleted file mode 100644 index 2d37d165b..000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse |