Attachment 119315 Details for Bug 248793 – patch

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

[patch] patch

245693.txt (text/plain), 4.01 KB, created by Kim Moir

on 2008-12-02 15:43:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2008-12-02 15:43:40 EST

Size: 4.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/sdk.tests/testScripts/test.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/test.xml,v
>retrieving revision 1.42.6.4
>diff -u -r1.42.6.4 test.xml
>--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml	31 Oct 2008 21:13:31 -0000	1.42.6.4
>+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml	3 Nov 2008 22:03:21 -0000
>@@ -75,11 +75,21 @@
> 	</target>
> 
> 	<target name="unzipderby" if="derby">
>+		<property name="tmpderby" value="${install}/tmpderby"/>
>+		<mkdir dir="${tmpderby}"/>
> 		<exec dir="." executable="unzip">
>-			<arg line="-o -qq eclipse-junit-tests-*.zip ${derby} -d ${install}" />
>+			
>+			<arg line="-o eclipse-junit-tests-*.zip ${derby} -d ${tmpderby}" />
> 		</exec>
>+		<move todir="${install}/eclipse/dropins/eclipse/plugins/">
>+			<fileset dir="${tmpderby}/eclipse/plugins/db/">
>+				<include name="**"/>
>+			</fileset>
>+		</move>
>+		<delete dir="${tmpderby}"/>
> 	</target>
> 
>+
> 	<target name="init" depends="setRuntimeArchive">
> 
> 		<mkdir dir="${results}/xml" />
>@@ -240,10 +250,10 @@
> 	</target>
> 	<target name="configureTeamTest" if="teamcvs">
> 		
>-		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="${cvs_user}" />
>-		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="${cvs_password}" />
>-		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="${cvs_host}" />
>-		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="${cvs_root}" />
>+		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@user@" value="cvstests" />
>+		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@password@" value="goteam4e" />
>+		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@host@" value="godel" />
>+		<replace file="${eclipse-home}/dropins/eclipse/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties" token="@root@" value="/home/sdimitro/repo" />
> 	</target>
> 
> 	<target name="configureDeltaPack" if="pdebuild">
>@@ -281,7 +291,8 @@
> 			<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml" />
> 
> 			
>-			<condition property="derby" value="eclipse/dropins/eclipse/plugins/db*/* ">
>+			
>+			<condition property="derby" value="eclipse/plugins/db/derby*">
> 				<equals arg1="${test.target}" arg2="performance" />
> 			</condition>
> 			
>@@ -549,7 +560,7 @@
> 		<property name="org.eclipse.equinox.p2.tests.prerequisite.testplugins" value="eclipse/plugins/org.eclipse.equinox.frameworkadmin.test_* eclipse/plugins/org.eclipse.equinox.p2.installer_*"/>
> 		<runTests testPlugin="org.eclipse.equinox.p2.tests"/>
> 	</target>
>-	
>+
> 	<target name="equinoxp2ui" depends="setJVMProperties">
> 		<property name="jvm" value="${J2SE-5.0}" />
> 		
>@@ -560,11 +571,11 @@
> 		</condition>
> 		<runTests testPlugin="org.eclipse.equinox.p2.tests.ui"/>
> 	</target>
>-	
>+
> 	<target name="search">
> 		<runTests testPlugin="org.eclipse.search.tests" />
> 	</target>
>-		
>+
> 	<target name="all">
> 		<antcall target="jdtcompilertool" />
> 		<antcall target="jdtcompilerapt" />

Actions: View | Diff

Attachments on bug 248793: 119315 | 119320 | 120064