Attachment 121670 Details for Bug 245360 – patch to disable perf tests on eclipseperfwin1

[patch] patch to disable perf tests on eclipseperfwin1

245360.txt (text/plain), 10.25 KB, created by Kim Moir

on 2009-01-06 13:42:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2009-01-06 13:42:32 EST

Size: 10.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/machine.cfg
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/machine.cfg,v
>retrieving revision 1.5.6.3
>diff -u -r1.5.6.3 machine.cfg
>--- eclipse/buildConfigs/sdk.tests/testConfigs/machine.cfg	20 Nov 2008 16:45:03 -0000	1.5.6.3
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/machine.cfg	6 Jan 2009 18:40:12 -0000
>@@ -22,7 +22,6 @@
> 
> #################  Performance test hosts  ################
> #Windows XP
>-win32xp-perf=eclipseperfwin1
> win32xp-perf2=eclipseperfwin2
> 
> #RedHat Enterprise Linux WS 3
>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.27
>diff -u -r1.27 testAll.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	15 May 2008 18:01:39 -0000	1.27
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	6 Jan 2009 18:40:12 -0000
>@@ -82,12 +82,7 @@
> 		<mkdir dir="${testResults}" />
> 
> 		<parallel>
>-			
>-			<antcall target="test">
>-				<param name="tester" value="${basedir}/win32xp-perf" />
>-				<param name="cfgKey" value="win32xp-perf" />
>-				<param name="markerName" value="eclipse-win32xp-perf-${buildId}" />
>-			</antcall>
>+						
> 			<antcall target="test">
> 				<param name="tester" value="${basedir}/rhelws3-perf" />
> 				<param name="cfgKey" value="rhelws3-perf" />
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat
>===================================================================
>RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat
>diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat	1 Aug 2007 20:15:49 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,12 +0,0 @@
>-@echo off
>-cd %1
>-REM test script
>-
>-mkdir results
>-
>-REM add Cloudscape plugin to junit tests zip file
>-zip eclipse-junit-tests-%3%.zip -rm eclipse
>-
>-REM run all tests
>-call runtests.bat -vm %cd%\..\jdk1.4.2_10\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf" 1> %2 2>&1
>-exit
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml
>===================================================================
>RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml
>diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml	3 Apr 2008 13:37:11 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,64 +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}/Cloudscape" type="dir" property="Cloudscape.available" />
>-		<antcall target="installCloudscape" />
>-	</target>
>-	
>-	<target name="installCloudscape" if="Cloudscape.available">
>-		<mkdir dir="${tester}/eclipse/dropins/eclipse/plugins" />
>-		<copy todir="${tester}/eclipse/dropins/eclipse/plugins">
>-			<fileset dir="${internalPlugins}" includes="Cloudscape/**" />
>-		</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/win32xp-perf/testing.properties
>===================================================================
>RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties
>diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties	28 Jul 2008 21:16:18 -0000	1.2.6.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +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
>-
>-#directory where test scripts are launched
>-executionDir=${testDir}\\eclipse-testing
>-
>-#eclipse platforms:  win32 | linux-motif | linux-gtk | aix-motif | hpux-motif |solaris-motif
>-platform=winxpperf
>-
>-#name of file that captures console output from running JUnit plug-in tests
>-consolelog=winxp.perf_consolelog.txt
>-
>-#name of script to execute on remote machine
>-testScript=start /min ${executionDir}\\testAll.bat
>-
>-#arguments to $(testScript)
>-args=${executionDir} winxp.perf_consolelog.txt ${buildId}
>-
>-#name and path to downloaded vm.
>-vmDest=jdk-1_4_2_10-fcs-bin-b03-windows-i586-10_oct_2005.zip
>-
>-#cvsroot
>-cvsRoot=sdimitro@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}"
>-
>-#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/win32xp-perf/vm.properties
>===================================================================
>RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties
>diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties	1 Aug 2007 21:03:59 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -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://trelenggtk.ottawa.ibm.com;dbname=perfDb34 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
>Index: eclipse/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
>retrieving revision 1.83.2.4
>diff -u -r1.83.2.4 helper.xml
>--- eclipse/helper.xml	5 Dec 2008 21:47:33 -0000	1.83.2.4
>+++ eclipse/helper.xml	6 Jan 2009 18:40:12 -0000
>@@ -337,7 +337,7 @@
> 						-jvm ${eclipse.perf.jvm}
> 						-print					    
> 						-output ${postingDirectory}/${buildLabel}/performance/
>-						-config eclipseperflnx3,eclipseperfwin2,eclipseperflnx2,eclipseperfwin1,eclipseperflnx1 
>+						-config eclipseperflnx3,eclipseperfwin2,eclipseperflnx2,eclipseperflnx1 
> 						-config.properties ${eclipse.perf.config.descriptors}
> 			            -dataDir ${postingDirectory}/../../data/v34
> 						-scenario.pattern org.eclipse.%.test%" />

Actions: View | Diff

Attachments on bug 245360: 121670