Attachment 177334 Details for Bug 323439 – patch

[patch] patch

323439.txt (text/plain), 39.05 KB, created by Kim Moir

on 2010-08-24 11:37:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-08-24 11:37:28 EDT

Size: 39.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml,v
>retrieving revision 1.2
>diff -u -r1.2 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml	11 Sep 2009 18:12:21 -0000	1.2
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -29,6 +29,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> </project>
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml,v
>retrieving revision 1.2
>diff -u -r1.2 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml	11 Sep 2009 18:12:21 -0000	1.2
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -44,6 +44,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="install5.0Vm">
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml,v
>retrieving revision 1.4
>diff -u -r1.4 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -45,6 +45,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="installdb" if="db.available">
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/Attic/customTest.xml,v
>retrieving revision 1.5
>diff -u -r1.5 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -1,71 +0,0 @@
>-<project name="Customized testing instructions" default="customSetup">
>-
>-	<target name="customSetup">
>-
>-		<antcall target="installVm" />
>-
>-		
>-		<chmod file="${tester}/testAll.sh" perm="755" />
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/testAll.sh ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${extraBinariesDir} ${testMachine}:${testDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-	</target>
>-
>-	<target name="installVm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
>-		</exec>
>-
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand}" />
>-		</exec>
>-	</target>
>-
>-	<target name="install5.0Vm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl5}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl5} ${testMachine}:${testDir}" />
>-		</exec>
>-
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand5}" />
>-		</exec>
>-	</target>
>-</project>
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/Attic/testAll.sh,v
>retrieving revision 1.4
>diff -u -r1.4 testAll.sh
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh	14 Jan 2010 16:05:54 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh	24 Aug 2010 15:36:32 -0000
>@@ -1,17 +0,0 @@
>-# !/bin/sh
>-cd .
>-#environment variables
>-PATH=$PATH:`pwd`/../linux;export PATH
>-xhost +$HOSTNAME
>-MOZILLA_FIVE_HOME=/usr/lib/firefox-1.5.0.12;export MOZILLA_FIVE_HOME
>-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
>-USERNAME=`whoami`
>-DISPLAY=$HOSTNAME:0.0
>-ulimit -c unlimited
>-
>-export USERNAME DISPLAY LD_LIBRARY_PATH
>-
>-#execute command to run tests
>-
>-./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk1.5.0_22/jre/bin/java -properties vm.properties 1> linux.gtk_consolelog.txt 2>&1
>-
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/Attic/testing.properties,v
>retrieving revision 1.9
>diff -u -r1.9 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties	14 Jan 2010 16:05:55 -0000	1.9
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,67 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2004, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-#target to call in test.xml:  runtests-local | runtests-remote
>-testTarget=runtests-remote
>-
>-#directory on test machine where automated testing framework will be installed
>-testDir=/buildtest/${buildLabel}
>-
>-#name of zip file containing automated testing framework and JUnit test plug-ins
>-testFramework=eclipse-Automated-Tests-${buildId}.zip
>-
>-#name of runtime to install and test
>-runtime=eclipse-SDK-${buildId}-linux-gtk.tar.gz
>-
>-#name of deltaPack to install and test
>-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
>-
>-#name of Platform runtime to install and test
>-runtimePlatform=eclipse-platform-${buildId}-linux-gtk.tar.gz
>-previousRuntimePlatform=eclipse-platform-3.5-linux-gtk.tar.gz
>-
>-#directory where test scripts are launched
>-executionDir=${testDir}/eclipse-testing
>-
>-#name of file that captures console output from running JUnit plug-in tests
>-consolelog=linux.gtk_consolelog.txt
>-
>-#name of script to execute on remote machine
>-testScript=cd  ${executionDir};./testAll.sh
>-
>-#arguments to $(testScript)
>-args=${executionDir} linux.gtk_consolelog.txt
>-
>-#cvsroot
>-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
>-
>-#name and path to downloaded vm.
>-vmDest=jdk-1_5_0_22-fcs-bin-b03-linux-i586-09_oct_2009.zip
>-
>-#URL to vm used to run tests
>-vmUrl=jdks/${vmDest}
>-
>-#command to execute via rsh to install the vm
>-vmInstallCommand=cd ${testDir};unzip ${vmDest}
>-
>-#name and path to downloaded 5.0 vm.
>-vmDest6=jdk-6u17-fcs-bin-b04-linux-i586-11_oct_2009.zip
>-
>-#URL to 5.0 vm used to run JDT Core tests
>-vmUrl6=jdks/${vmDest6}
>-
>-#command to execute via rsh to install the vm
>-vmInstallCommand6=cd ${testDir};unzip ${vmDest6}
>-
>-#Ant property to set if default vm installation not required
>-skipVmInstall=true
>-
>-#extra binaries directory relative to testConfigs directory
>-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/linux
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/Attic/vm.properties,v
>retrieving revision 1.4
>diff -u -r1.4 vm.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties	20 Jan 2010 15:27:18 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,11 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2000, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-#J2SE-5.0=/buildtest/@buildid@/jdk1.5.0_22/jre/bin/java
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml,v
>retrieving revision 1.4
>diff -u -r1.4 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -30,6 +30,7 @@
> 		
> 		<available file="${internalPlugins}/org.apache.derby_10.4.2.0" type="dir" property="db.available" />
> 		<antcall target="installdb" />
>+
> 		
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
>@@ -44,6 +45,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="installdb" if="db.available">
>@@ -74,4 +80,6 @@
> 		</exec>
> 	</target>
> 
>+
>+
> </project>
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh,v
>retrieving revision 1.4
>diff -u -r1.4 testAll.sh
>--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh	14 Jan 2010 16:05:53 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh	24 Aug 2010 15:36:32 -0000
>@@ -15,6 +15,6 @@
> zip eclipse-junit-tests-$1.zip -rm eclipse
> 
> #all tests
>-./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk1.5.0_22/jre/bin/java -properties vm.properties -Dtest.target=performance -Dplatform=linuxgtkperf1 1> linux.gtk.perf1_consolelog.txt 2>&1
>+./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk6_17/jre/bin/java -properties vm.properties -Dtest.target=performance -Dplatform=linuxgtkperf1 1> linux.gtk.perf1_consolelog.txt 2>&1
> 
> 
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties,v
>retrieving revision 1.7
>diff -u -r1.7 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties	14 Jan 2010 16:05:53 -0000	1.7
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties	24 Aug 2010 15:36:32 -0000
>@@ -46,10 +46,10 @@
> cvsRoot=kmoir@ottcvs1:/home/cvs/releng
> 
> #name and path to downloaded vm.
>-vmDest=jdk-1_5_0_22-fcs-bin-b03-linux-i586-09_oct_2009.zip
>+vmDest=jdk-6u17-fcs-bin-b04-linux-i586-11_oct_2009.zip
> 
> #URL to vm used to run tests
>-vmUrl=jdks/${vmDest}
>+vmUrl=jdks/1.6/${vmDest}
> 
> #command to execute via rsh to install the vm
> vmInstallCommand=cd ${testDir};unzip ${vmDest}
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml,v
>retrieving revision 1.32
>diff -u -r1.32 testAll.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	2 Oct 2009 15:48:05 -0000	1.32
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	24 Aug 2010 15:36:32 -0000
>@@ -39,16 +39,11 @@
> 				<param name="cfgKey" value="macosx" />
> 				<param name="markerName" value="eclipse-macosx-${buildId}" />
> 			</antcall>
>-			<antcall target="test">
>+					
> 			<antcall target="test">
> 				<param name="tester" value="${basedir}/rhelws5-6.0" />
> 				<param name="cfgKey" value="rhelws5-6.0" />
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/customTest.xml,v
>retrieving revision 1.4
>diff -u -r1.4 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -1,76 +0,0 @@
>-
>-<project name="Customized testing instructions" default="customSetup">
>-
>-	<target name="customSetup">
>-		
>-		<property file="${ref.properties}" />
>-
>-		<antcall target="installVm" />
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/testAll.bat ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		<antcall target="replaceBuildId" />
>-
>-		<replace file="${tester}/vm.properties" token="@buildType@@timestamp@" value="${buildId}" />
>-		<replace file="${tester}/vm.properties" token="@reference@" value="${eclipse.perf.ref}" />
>-		<replace file="${tester}/vm.properties" token="@testMachine@" value="${testMachine}" />
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<available file="${internalPlugins}/org.apache.derby_10.4.2.0" type="dir" property="db.available" />
>-		<antcall target="installdb" />
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-	</target>
>-
>-	<target name="installdb" if="db.available">
>-		<mkdir dir="${tester}/eclipse/dropins/eclipse/plugins" />
>-		<copy todir="${tester}/eclipse/dropins/eclipse/plugins">
>-			<fileset dir="${internalPlugins}" includes="org.apache.derby_10.4.2.0/**" />
>-		</copy>
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="-r eclipse ${testMachine}:${executionDir}" />
>-		</exec>
>-	</target>
>-
>-	<target name="replaceBuildId" if="performance.base">
>-		<replace file="${tester}/vm.properties" token="@buildType@@timestamp@" value="${testedBuildIdDBLabel}" />
>-	</target>
>-
>-	<target name="installVm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
>-		</exec>
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand}" />
>-		</exec>
>-	</target>
>-</project>
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/testAll.bat,v
>retrieving revision 1.5
>diff -u -r1.5 testAll.bat
>--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat	14 Jan 2010 16:05:54 -0000	1.5
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat	24 Aug 2010 15:36:32 -0000
>@@ -1,15 +0,0 @@
>-@echo off
>-cd %1
>-REM test script
>-
>-REM add the extra binaries to the system path
>-set PATH=%PATH%;%1\..\windowsBin
>-
>-mkdir results
>-
>-REM add Cloudscape plugin to junit tests zip file
>-zip eclipse-junit-tests-%3%.zip -rm eclipse
>-
>-REM run all tests.  -vm argument used as is to eclipse launcher for target eclipse
>-call runtests.bat -vm %cd%\..\jdk6_17\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf2" 1> %2 2>&1
>-exit
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/testing.properties,v
>retrieving revision 1.8
>diff -u -r1.8 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties	14 Jan 2010 16:05:53 -0000	1.8
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,67 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2004, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-#target to call in test.xml:  runtests-local | runtests-remote
>-testTarget=runtests-remote
>-
>-#use rsh as protocol for login and copying files.
>-rsh=true
>-
>-#directory on test machine where automated testing framework will be installed
>-testDir=c:\\buildtest\\${buildLabel}
>-
>-#name of zip file containing automated testing framework and JUnit test plug-ins
>-testFramework=eclipse-Automated-Tests-${buildId}.zip
>-
>-#name of runtime to install and test
>-runtime=eclipse-SDK-${buildId}-win32.zip
>-
>-#name of deltaPack to install and test
>-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
>-
>-#name of Platform runtime to install and test
>-runtimePlatform=eclipse-platform-${buildId}-win32.zip
>-previousRuntimePlatform=eclipse-platform-3.5-win32.zip
>-
>-#directory where test scripts are launched
>-executionDir=${testDir}\\eclipse-testing
>-
>-#eclipse platforms:  win32 | linux-motif | linux-gtk | aix-motif | hpux-motif |solaris-motif
>-platform=win32perf2
>-
>-#name of file that captures console output from running JUnit plug-in tests
>-consolelog=winxp.perf2_consolelog.txt
>-
>-#name of script to execute on remote machine
>-testScript=start /min /wait ${executionDir}\\testAll.bat
>-
>-#arguments to $(testScript)
>-args=${executionDir} winxp.perf2_consolelog.txt ${buildId}
>-
>-#name and path to downloaded vm.
>-vmDest=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
>-
>-#cvsroot
>-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
>-
>-#URL to vm used to run tests
>-vmUrl=jdks/1.6/${vmDest}
>-
>-#command to execute via rsh to install the vm
>-vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
>-
>-#Ant property to set default vm installation
>-skipVmInstall=true
>-
>-#extra binaries directory relative to testConfigs directory
>-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/windowsBin
>-
>-#Cloudscape plug-in location
>-internalPlugins=${base.builder}/../eclipseInternalBuildTools/plugins
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/vm.properties,v
>retrieving revision 1.4.8.2
>diff -u -r1.4.8.2 vm.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties	29 Jul 2010 20:54:57 -0000	1.4.8.2
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,11 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2000, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-extraVMargs=-Declipse.perf.dbloc=net://minsky.ottawa.ibm.com:1528;dbname=perfDb37 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml,v
>retrieving revision 1.5
>diff -u -r1.5 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -38,6 +38,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="install6.0Vm">
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml,v
>retrieving revision 1.8
>diff -u -r1.8 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.8
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -45,6 +45,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="installdb" if="db.available">
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat,v
>retrieving revision 1.6
>diff -u -r1.6 testAll.bat
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat	14 Jan 2010 16:05:54 -0000	1.6
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat	24 Aug 2010 15:36:32 -0000
>@@ -8,5 +8,5 @@
> zip eclipse-junit-tests-%3%.zip -rm eclipse
> 
> REM run all tests
>-call runtests.bat -vm %cd%\..\jdk1.5.0_22\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf1" 1> %2 2>&1
>+call runtests.bat -vm %cd%\..\jdk6_17\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf1" 1> %2 2>&1
> exit
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties,v
>retrieving revision 1.11
>diff -u -r1.11 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties	14 Jan 2010 16:05:54 -0000	1.11
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties	24 Aug 2010 15:36:32 -0000
>@@ -46,17 +46,26 @@
> args=${executionDir} winxp.perf1_consolelog.txt ${buildId}
> 
> #name and path to downloaded vm.
>-vmDest=jdk-1_5_0_22-fcs-bin-b03-windows-i586-09_oct_2009.zip
>+vmDest=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
> 
> #cvsroot
> cvsRoot=kmoir@ottcvs1:/home/cvs/releng
> 
> #URL to vm used to run tests
>-vmUrl=jdks/${vmDest}
>+vmUrl=jdks/1.6/${vmDest}
> 
> #command to execute via rsh to install the vm
> vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
> 
>+#name and path to 5.0 vm.
>+vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
>+
>+#URL to 5.0 vm used to run jdt core tests
>+vmUrl6=jdks/1.6/${vmDest6}
>+
>+#command to execute via rsh to install the 5.0 vm
>+vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
>+
> #Ant property to set default vm installation
> skipVmInstall=true
> 
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/customTest.xml,v
>retrieving revision 1.5
>diff -u -r1.5 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -1,76 +0,0 @@
>-<project name="Customized testing instructions" default="customSetup">
>-
>-	<target name="customSetup">
>-		<antcall target="installVm" />
>-		<antcall target="install1.6Vm" />
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/testAll.bat ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		<replace file="${tester}/vm.properties" token="@buildid@" value="${buildId}" />
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-
>-		
>-		<exec dir="." executable="${copyClient}">
>-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
>-		</exec>
>-	</target>
>-
>-	<target name="installVm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
>-		</exec>
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand}" />
>-		</exec>
>-	</target>
>-
>-	<target name="install5.0Vm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl6}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl6} ${testMachine}:${testDir}" />
>-		</exec>
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand5}" />
>-		</exec>
>-	</target>
>-
>-	<target name="install1.6Vm">
>-		<property name="testVmTag" value="HEAD" />
>-		
>-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl6}" dest="${tester}" />
>-
>-		<exec dir="${tester}" executable="${copyClient}">
>-			<arg line="${vmUrl6} ${testMachine}:${testDir}" />
>-		</exec>
>-		<exec dir="." executable="${loginClient}">
>-			<arg line="${testMachine} ${vmInstallCommand6}" />
>-		</exec>
>-	</target>
>-</project>
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/testAll.bat,v
>retrieving revision 1.6
>diff -u -r1.6 testAll.bat
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat	14 Jan 2010 16:05:55 -0000	1.6
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat	24 Aug 2010 15:36:32 -0000
>@@ -1,11 +1 @@
>-@echo off
>-cd %1
>-REM test script
> 
>-REM add the extra binaries to the system path
>-set PATH=%PATH%;%1\..\windowsBin
>-
>-REM run all tests
>-call runtests.bat -vm %cd%\..\jdk1.5.0_22\jre\bin\javaw -properties vm.properties 1> %2 2>&1
>-
>-exit
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/testing.properties,v
>retrieving revision 1.14
>diff -u -r1.14 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties	14 Jan 2010 16:05:55 -0000	1.14
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,78 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2004, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-#target to call in test.xml:  runtests-local | runtests-remote
>-testTarget=runtests-remote
>-
>-#use rsh as protocol for login and copying files.
>-rsh=true
>-
>-#directory on test machine where automated testing framework will be installed
>-testDir=c:\\buildtest\\${buildLabel}
>-
>-#name of zip file containing automated testing framework and JUnit test plug-ins
>-testFramework=eclipse-Automated-Tests-${buildId}.zip
>-
>-#name of runtime to install and test
>-runtime=eclipse-SDK-${buildId}-win32.zip
>-
>-#name of deltaPack to install and test
>-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
>-
>-#name of Platform runtime to install and test
>-runtimePlatform=eclipse-platform-${buildId}-win32.zip
>-previousRuntimePlatform=eclipse-platform-3.5-win32.zip
>-
>-#directory where test scripts are launched
>-executionDir=${testDir}\\eclipse-testing
>-
>-#name of file that captures console output from running JUnit plug-in tests
>-consolelog=win32_consolelog.txt
>-
>-#name of script to execute on remote machine
>-testScript=start /min /wait ${executionDir}\\testAll.bat
>-
>-#arguments to $(testScript)
>-args=${executionDir} win32_consolelog.txt
>-
>-#name and path to downloaded vm.
>-vmDest=jdk-1_5_0_22-fcs-bin-b03-windows-i586-09_oct_2009.zip
>-
>-#cvsroot
>-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
>-
>-#URL to vm used to run tests
>-vmUrl=jdks/${vmDest}
>-
>-#command to execute via rsh to install the vm
>-vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
>-
>-#name and path to 5.0 vm.
>-vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
>-
>-#URL to 5.0 vm used to run jdt core tests
>-vmUrl6=jdks/${vmDest6}
>-
>-#command to execute via rsh to install the 5.0 vm
>-vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
>-
>-#name and path to 1.6 vm.
>-vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
>-
>-#URL to 1.6 vm used to run jdt core tests
>-vmUrl6=jdks/1.6/${vmDest6}
>-
>-#command to execute via rsh to install the 1.6 vm
>-vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
>-#Ant property to set default vm installation
>-skipVmInstall=true
>-
>-#extra binaries directory relative to testConfigs directory
>-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/windowsBin
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/vm.properties,v
>retrieving revision 1.4
>diff -u -r1.4 vm.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties	20 Jan 2010 15:27:21 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties	24 Aug 2010 15:36:32 -0000
>@@ -1,12 +0,0 @@
>-###############################################################################
>-# Copyright (c) 2000, 2006 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
>-#J2SE-5.0=c:/buildtest/@buildid@/jdk1.5.0_06/jre/bin/java
>-J2SE-6.0=c:/buildtest/@buildid@/jdk6_17/jre/bin/javaw
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml,v
>retrieving revision 1.3
>diff -u -r1.3 customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.3
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml	24 Aug 2010 15:36:32 -0000
>@@ -45,6 +45,11 @@
> 		<exec dir="." executable="${copyClient}">
> 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
> 		</exec>
>+
>+		
>+		<exec dir="." executable="${copyClient}">
>+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
>+		</exec>
> 	</target>
> 
> 	<target name="installdb" if="db.available">

Actions: View | Diff

Attachments on bug 323439: 177334