Attachment 224029 Details for Bug 395099 – junit.patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] junit.patch

junit.patch (text/plain), 94.44 KB, created by Thanh Ha

on 2012-11-27 22:01:11 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thanh Ha

Created: 2012-11-27 22:01:11 EST

Size: 94.44 KB

patch

obsolete

>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 d1df078..34a366d 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
>@@ -148,8 +148,7 @@
> <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>
>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 da0d646..7587170 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,88 @@
>-# !/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
>+
>+#set the DISPLAY for running tests on Linux
>+DISPLAY=`$HOST`: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" = "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`
>+# -Dtimeout=1800000
>+$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
>+
>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 f9a578d..1a153c5 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
>@@ -2,7 +2,6 @@
> 
> 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=
>@@ -39,7 +38,7 @@ 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
>@@ -47,6 +46,7 @@ if x%1==x-vm set vmcmd="%2" && shift && shift && goto processcmdlineargs
> 
> set tests=%tests% %1 && shift && goto processcmdlineargs
> 
>+echo Specified test targets (if any): %tests%
> 
> :run
> REM ***************************************************************************
>@@ -56,7 +56,12 @@ 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
>+
>+echo "list all environment variables in effect as tests start"
>+set
>+
>+rem -Dtimeout=300000 "%ANT_OPTS%" 
>+%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
> 
>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 10ad816..a1f4383 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,25 @@
>-#!/bin/sh
>+#!/usr/bin/env bash
>+
>+echo "USER: $USER"
>+echo "PATH: $PATH"
>+# 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=
>@@ -32,36 +42,46 @@ 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;;
>+        -vm) 
>+            vmcmd="${2}"; shift;;
>+        *) 
>+            tests=$tests\ ${1};;
>+    esac
>+    shift
> done
> 
>+echo "Specified test targets (if any): ${tests}"
>+
> # 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
>@@ -70,20 +90,117 @@ 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
>+    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`
>-$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
>+    # run tests
>+    launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
>+    
> 
>-# 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
>+# 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
>+
>+
>+# variables of special interest, though most won't be defined
>+#echo "\$WINDOWMANAGER: $WINDOWMANAGER"
>+#echo "\$WINDOW_MANAGER: $WINDOW_MANAGER"
>+#echo "\$DESKTOP_SESSION: $DESKTOP_SESSION"
>+#echo "\$XDG_CURRENT_DESKTOP: $XDG_CURRENT_DESKTOP"
>+#echo "\$GDMSESSION: $GDMSESSION"    
>+            
>+#echo "uname -a"
>+#uname -a
>+    #    echo 
>+    #echo "lsb_release -a"
>+    #lsb_release -a
>+    #echo 
>+        
>+#echo "cat /etc/lsb-release"
>+#cat /etc/lsb-release
>+    #    echo 
>+
>+#echo "cat /etc/SuSE-release"
>+#cat /etc/SuSE-release
>+    #    echo 
>+
>+#echo "rpm -q cairo"
>+#rpm -q cairo
>+    #    echo 
>+
>+#echo "rpm -q gtk2"
>+#rpm -q gtk2
>+    #    echo 
>+
>+#echo "rpm -q glibc"
>+#rpm -q glibc
>+    #    echo 
>+
>+#echo "rpm -q glib2"
>+#rpm -q glib2
>+    #    echo 
>+
>+#echo "rpm -q pango"
>+#rpm -q pango
>+    #    echo 
>+
>+       #    echo
>+    #echo "Check for popular desktop environments (gnome|kde):"
>+    #ps -ef | egrep -i "gnome|kde" | grep -v egrep
>+ 
>+     #    echo
>+    #echo "Check for popular desktop environments:"
>+    #ps -ef | egrep -i "unity|mint|gnome|kde|xfce|ion|wmii|dwm" | grep -v egrep
>+ 
>+     #echo "DISPLAY: $DISPLAY"
>+
>+    # 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
>+        
>+    # -Dtimeout=300000 "${ANT_OPTS}"
>+    $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
>+
>+else
>+    # display message to user if os, ws and arch are invalid
>+    echo "The os, ws and arch values are either invalid or are an invalid combination"
>+    exit 1
> 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 100644
>index 0000000..acf0217
>--- /dev/null
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtestsmac.sh
>@@ -0,0 +1,92 @@
>+#!/bin/sh
>+
>+# 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=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
>+
>+echo "Specified test targets (if any): ${tests}"
>+
>+# 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" = "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`
>+
>+    echo "list all environment variables in effect as tests start"
>+    printenv
>+
>+# -Dtimeout=300000 "${ANT_OPTS}"
>+$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
>+
>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 907429f..f318fa3 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=".">
> 
> 	
>-	<property file="test.properties" />
>+    <property file="test.properties" />
> 
> 	
>-	<property file="label.properties" />
>+    <property file="label.properties" />
> 
> 	
>-	<property name="install" value="${basedir}/test-eclipse" />
>+    <property
>+        name="install"
>+        value="${basedir}/test-eclipse" />
> 
> 	
>-	<property name="platform" value="${os}.${ws}.${arch}" />
>+    <property
>+        name="platform"
>+        value="${os}.${ws}.${arch}" />
> 
> 	
>-	<property name="eclipse-home" value="${install}/eclipse" />
>+    <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="repoZip"
>+        value="${basedir}/eclipse-junit-tests-${buildId}.zip" />
>+    <property
>+        name="repoLocation"
>+        value="${basedir}/testRepo" />
>+    <property
>+        name="platformLocation"
>+        value="${basedir}/platformLocation" />
> 
> 	
>-	<property name="results" value="${basedir}/results" />
>+    <property
>+        name="results"
>+        value="${basedir}/results" />
> 
> 	
>-	<property name="junit-report-output" value="${results}/${platform}" />
>-	<property name="coverage-output" value="${results}/coverage" />
>+    <property
>+        name="junit-report-output"
>+        value="${results}/${platform}" />
>+	
>+	
>+    <property
>+        name="coverage-output"
>+        value="${results}/coverageIGNORE" />
> 
>+    <echo message="DEBUG: org.eclipse.core.net.prefs: ${org.eclipse.core.net.prefs}" /> 
>+    
> 	
>-	<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>
> 
> 	
>-	<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>
> 
> 	
>-	<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>
> 
> 	
>-	<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>
> 
> 	
>-	<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" />
>+                
>+            </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>
> 
> 
> 	
>-	<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>
> 
> 	
>-	<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="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" />
>+    <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>
>+        <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="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="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}" />
>+    <target
>+        name="init"
>+        depends="setRuntimeArchive">
>+        <mkdir dir="${results}/xml" />
>+        <mkdir dir="${results}/html" />
>+        <mkdir dir="${junit-report-output}" />
> 		
>-		<exec dir="${basedir}" executable="chflags" os="Mac OS X">
>-			<arg line="-R nouchg ${install}" />
>-		</exec>
>-	</target>
>+        <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="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">
>+    <target
>+        name="setJVMProperties"
>+        depends="setJVMfromUserSpecified">
> 		
>-		<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 &quot;1.7" />
>-		</condition>
>-		<condition property="J2SE-6.0" value="${jvm}">
>-			<or>
>-				<contains string="${javaversion}" substring="java version &quot;1.6" />
>-				<contains string="${javaversion}" substring="java version &quot;1.7" />
>-			</or>
>-		</condition>
>-		<condition property="J2SE-5.0" value="${jvm}">
>-			<or>
>-				<or>
>-					<contains string="${javaversion}" substring="java version &quot;1.7" />
>-					<contains string="${javaversion}" substring="java version &quot;1.6" />
>-				</or>
>-				<contains string="${javaversion}" substring="java version &quot;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 &quot;1.7" />
>+        </condition>
>+        <condition
>+            property="J2SE-6.0"
>+            value="${jvm}">
>+            <or>
>+                <contains
>+                    string="${javaversion}"
>+                    substring="java version &quot;1.6" />
>+                <contains
>+                    string="${javaversion}"
>+                    substring="java version &quot;1.7" />
>+            </or>
>+        </condition>
>+        <condition
>+            property="J2SE-5.0"
>+            value="${jvm}">
>+            <or>
>+                <or>
>+                    <contains
>+                        string="${javaversion}"
>+                        substring="java version &quot;1.7" />
>+                    <contains
>+                        string="${javaversion}"
>+                        substring="java version &quot;1.6" />
>+                </or>
>+                <contains
>+                    string="${javaversion}"
>+                    substring="java version &quot;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">
> 		
>-		<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>
>+        <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>
> 
>+    <macrodef name="runTests">
>+        <attribute name="testPlugin" />
>+        <sequential>
>+            <antcall target="markCurrentTime">
>+                <param
>+                    name="message"
>+                    value="start @{testPlugin}" />
>+            </antcall>
> 			
> 			
> 
>-			<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>
> 
> 			
>-			<property name="test.target" value="junit" />
>-			<property name="report" value="@{testPlugin}" />
>+            <property
>+                name="test.target"
>+                value="junit" />
>+            <property
>+                name="report"
>+                value="@{testPlugin}" />
> 
> 			
>-			<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>
> 			
> 			
>-			<antcall target="${test.target}">
>-				<param name="testPlugin" value="@{testPlugin}" />
>-				<param name="output-file" value="@{testPlugin}.xml" />
>-			</antcall>
>-		</sequential>
>-	</macrodef>
>+            <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="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="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="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" />
>+    <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>
>+        <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="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="ant">
>+        <runTests testPlugin="org.eclipse.ant.tests.core" />
>+    </target>
> 
>-	<target name="antui">
>-		<runTests testPlugin="org.eclipse.ant.tests.ui" />
>-	</target>
>+    <target name="antui">
>+        <runTests testPlugin="org.eclipse.ant.tests.ui" />
>+    </target>
> 
>-	<target name="compare">
>-		<runTests testPlugin="org.eclipse.compare.tests" />
>-	</target>
>+    <target name="compare">
>+        <runTests testPlugin="org.eclipse.compare.tests" />
>+    </target>
> 
>-	<target name="equinoxds">
>-		<runTests testPlugin="org.eclipse.equinox.ds.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="debug">
>+        <runTests testPlugin="org.eclipse.debug.tests" />
>+    </target>
> 
>-	<target name="coreresources">
>-		<runTests testPlugin="org.eclipse.core.tests.resources" />
>-	</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="coreruntime">
>+        <runTests testPlugin="org.eclipse.core.tests.runtime" />
>+    </target>
> 
>-	<target name="osgi">
>-		<runTests testPlugin="org.eclipse.osgi.tests" />
>-	</target>
>+    <target name="osgi">
>+        <runTests testPlugin="org.eclipse.osgi.tests" />
>+    </target>
> 
>-	<target name="coreexpressions">
>-		<runTests testPlugin="org.eclipse.core.expressions.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="ltkuirefactoringtests">
>+        <runTests testPlugin="org.eclipse.ltk.ui.refactoring.tests" />
>+    </target>
> 
>-	<target name="ltkcorerefactoringtests">
>-		<runTests testPlugin="org.eclipse.ltk.core.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="text">
>+        <runTests testPlugin="org.eclipse.text.tests" />
>+    </target>
> 
>-	<target name="jface">
>-		<runTests testPlugin="org.eclipse.jface.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="jfacedatabinding">
>+        <runTests testPlugin="org.eclipse.jface.tests.databinding" />
>+    </target>
> 
>-	<target name="filebuffers">
>-		<runTests testPlugin="org.eclipse.core.filebuffers.tests" />
>-	</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="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="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="ua">
>+        <runTests testPlugin="org.eclipse.ua.tests" />
>+    </target>
> 
>-	<target name="uadoc">
>-		<runTests testPlugin="org.eclipse.ua.tests.doc" />
>-	</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="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="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}" />
>+    <target
>+        name="jdtapt"
>+        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.jdt.apt.tests" />
>-	</target>
>+        <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}" />
>+    <target
>+        name="jdtaptpluggable"
>+        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.apt.pluggable.tests" />
>-	</target>
>+        <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">
>+    <target
>+        name="jdtcorebuilder"
>+        depends="setJVMProperties">
> 		
>-		<condition property="jvm" value="${J2SE-5.0}">
>-			<isset property="J2SE-5.0" />
>-		</condition>
>-		<runTests testPlugin="org.eclipse.jdt.core.tests.builder" />
>-	</target>
>+        <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}" />
>+    <target
>+        name="jdtcompilertool"
>+        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>
>+        <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}" />
>+    <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.apt.tests" />
>-	</target>
>+        <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="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="jdtcoreperf">
>+        <runTests testPlugin="org.eclipse.jdt.core.tests.performance" />
>+    </target>
> 
>-	<target name="jdtdebug">
>-		<runTests testPlugin="org.eclipse.jdt.debug.tests" />
>-	</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="jdtui">
>+        <runTests testPlugin="org.eclipse.jdt.ui.tests" />
>+    </target>
> 
>-	<target name="jdtuirefactoring">
>-		<runTests testPlugin="org.eclipse.jdt.ui.tests.refactoring" />
>-	</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="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="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="swt">
>+        <runTests testPlugin="org.eclipse.swt.tests" />
>+    </target>
> 
>-	<target name="teamcore">
>-		<runTests testPlugin="org.eclipse.team.tests.core" />
>-	</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="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="ui">
>+        <runTests testPlugin="org.eclipse.ui.tests" />
>+    </target>
> 
>-	<target name="uinavigator">
>-		<runTests testPlugin="org.eclipse.ui.tests.navigator" />
>-	</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="uircp">
>+        <runTests testPlugin="org.eclipse.ui.tests.rcp" />
>+    </target>
> 
>-	<target name="uiforms">
>-		<runTests testPlugin="org.eclipse.ui.tests.forms" />
>-	</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="uieditors">
>+        <runTests testPlugin="org.eclipse.ui.editors.tests" />
>+    </target>
> 
>-	<target name="uiperformance">
>-		<runTests testPlugin="org.eclipse.ui.tests.performance" />
>-	</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="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="uiworkbenchtexteditor">
>+        <runTests testPlugin="org.eclipse.ui.workbench.texteditor.tests" />
>+    </target>
> 
>-	<target name="update">
>-		<runTests testPlugin="org.eclipse.update.tests.core" />
>-	</target>
>+    <target name="update">
>+        <runTests testPlugin="org.eclipse.update.tests.core" />
>+    </target>
> 
>-	<target name="pdeapitooling" depends="setJVMProperties">
>-		<property name="jvm" value="${J2SE-5.0}" />
>+    <target
>+        name="pdeapitooling"
>+        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>
>+        <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="equinoxsecurity">
>+        <runTests testPlugin="org.eclipse.equinox.security.tests" />
>+    </target>
> 
>-	<target name="equinoxp2" depends="setJVMProperties">
>-		<property name="jvm" value="${J2SE-5.0}" />
>+    
>+    <target
>+        name="equinoxp2"
>+        depends="setJVMProperties, checkOS"
>+        unless="isMac">
>+        <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>
>+        <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}" />
>+    
>+    <target
>+        name="equinoxp2ui"
>+        depends="setJVMProperties, checkOS"
>+        unless="isMac">
>+        <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>
>+        <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}" />
>+    <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.discovery" />
>-	</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>
>+
>+    
>+    <target name="platform">
>+        <antcall target="ant" />
>+        <antcall target="antui" />
>+        <antcall target="compare" />
> 
>-	<target name="search">
>-		<runTests testPlugin="org.eclipse.search.tests" />
>-	</target>
>+        <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" />
> 
>-	<target name="pdeds">
>-		<runTests testPlugin="org.eclipse.pde.ds.tests" />
>-	</target>
>+        
>+        
> 
>-	<target name="bidi">
>-		<runTests testPlugin="org.eclipse.equinox.bidi.tests" />
>-	</target>
>+        <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>
> 
>+    
>+    <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>
> 
>-	<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 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>
>+            
>+            <echo
>+                message="@{msg}     "
>+                append="true"
>+                file="${junit-report-output}/testTimes.log" />
>+            
>+            <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">
>+        
>+        <property
>+            name="message"
>+            value="no message given by caller" />
>+        <markTime msg="${message}" />
>+    </target>
> 
>-	</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 c4c3b9b..0000000
>--- 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 533fddf..0000000
>--- 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 2d37d16..0000000
>--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/testScripts/CVS/Root
>+++ /dev/null
>@@ -1 +0,0 @@
>-:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse

Actions: View | Diff

Attachments on bug 395099: 224029 | 224155