Attachment 92092 Details for Bug 208021 – Updated patch

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

[patch] Updated patch

patch.txt (text/plain), 7.68 KB, created by John Arthorne

on 2008-03-10 17:36:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2008-03-10 17:36:36 EDT

Size: 7.68 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.36
>diff -u -r1.36 test.xml
>--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml	6 Mar 2008 15:40:28 -0000	1.36
>+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml	10 Mar 2008 21:35:32 -0000
>@@ -70,7 +70,7 @@
> 				eclipse/plugins/org.eclipse.ant.optional.junit_*
> 				${testPluginsRequired}
> 				-x eclipse/plugins/*.source*/**
>-				-d ${install}" />
>+				-d ${install}/eclipse/dropins/" />
> 		</exec>
> 	</target>
> 
>@@ -220,10 +220,10 @@
> 	</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}" />
>+		<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}" />
> 	</target>
> 
> 	<target name="configureDeltaPack" if="pdebuild">
>@@ -257,8 +257,11 @@
> 			<property name="test.target" value="junit" />
> 			<property name="report" value="@{testPlugin}" />
> 
>+			
>+			  <property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/library.xml"/>
>+
> 			
>-			<condition property="derby" value="eclipse/plugins/Cloudscape*/* ">
>+			<condition property="derby" value="eclipse/dropins/eclipse/plugins/Cloudscape*/* ">
> 				<equals arg1="${test.target}" arg2="performance" />
> 			</condition>
> 			<property name="derby" value="" />
>@@ -272,19 +275,19 @@
> 
> 	<target name="junit" unless="skip.test">
> 		<antcall target="setup" />
>-		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
>+		<ant antfile="${eclipse-home}/dropins/eclipse/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
> 		<antcall target="genResults" />
> 	</target>
> 
> 	<target name="performance" if="performance.target.present" unless="skip.test">
> 		<antcall target="setup" />
>-		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" target="performance" />
>+		<ant antfile="${eclipse-home}/dropins/eclipse/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" target="performance" />
> 		<antcall target="genResults" />
> 	</target>
> 
> 	<target name="genResults">
> 		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
>-		<style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
>+		<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
> 	</target>
> 
> 	<target name="ant">
>Index: eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat,v
>retrieving revision 1.4
>diff -u -r1.4 runtests.bat
>--- eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat	1 Aug 2007 20:15:49 -0000	1.4
>+++ eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat	10 Mar 2008 21:35:32 -0000
>@@ -25,7 +25,7 @@
> REM Install Eclipse if it does not exist
> REM
> REM ****************************************************************
>-if NOT EXIST eclipse unzip -qq -o eclipse-SDK-*.zip && unzip -qq -o -C eclipse-junit-tests*.zip */plugins/org.eclipse.test*
>+if NOT EXIST eclipse unzip -qq -o eclipse-SDK-*.zip && unzip -qq -o -C eclipse-junit-tests*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
> 
> 
> :processcmdlineargs
>Index: eclipse/buildConfigs/sdk.tests/testScripts/runtests
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/runtests,v
>retrieving revision 1.8
>diff -u -r1.8 runtests
>--- eclipse/buildConfigs/sdk.tests/testScripts/runtests	1 Aug 2007 20:15:49 -0000	1.8
>+++ eclipse/buildConfigs/sdk.tests/testScripts/runtests	10 Mar 2008 21:35:32 -0000
>@@ -71,7 +71,7 @@
> 	if [ ! -r eclipse ]
> 	then
> 		tar -xzf eclipse-SDK-*.tar.gz
>-		unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test*
>+		unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
> fi
> 
> # run tests
>#P org.eclipse.test
>Index: library.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.test/library.xml,v
>retrieving revision 1.31
>diff -u -r1.31 library.xml
>--- library.xml	7 Nov 2007 21:26:08 -0000	1.31
>+++ library.xml	10 Mar 2008 21:35:33 -0000
>@@ -65,7 +65,7 @@
> 	  	
> 	   	<property name="jvm" value="${java.home}/bin/java" />
>   	
>-		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
>+		<echo message="Initializing test application..."/>
> 
> 		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
> 			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
>@@ -74,6 +74,24 @@
> 	            	<include name="org.eclipse.equinox.launcher_*.jar"/>
> 	          	</fileset>
> 	        </classpath>
>+		    <arg line="-initialize"/>
>+		    <arg line="-os ${os}"/>
>+		    <arg line="-ws ${ws}"/>
>+		    <arg line="-arch ${arch}"/>
>+		    <arg line="-consolelog"/>
>+		    <jvmarg line="${vmargs} ${extraVMargs}"/>
>+		    <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/> 
>+		</java>
>+		
>+		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
>+		
>+		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
>+			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
>+	        <classpath>
>+	    		<fileset dir="${eclipse-home}/plugins">
>+	            	<include name="org.eclipse.equinox.launcher_*.jar"/>
>+	          	</fileset>
>+	        </classpath>
> 		    <arg line="-application ${application}"/>
> 		    <arg line="-data ${data-dir}"/>
> 		    <arg line="formatter=${formatter},${test-output}"/>
>@@ -138,7 +156,7 @@
> 			</fileset>
> 		</junitreport>
> 
>-		<style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL"
>+		<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
> 			basedir="${junit-report-output}"
> 			includes="${classname}.result.xml"
> 			destdir="${junit-report-output}" />

Actions: View | Diff

Attachments on bug 208021: 92076 | 92092 | 92235 | 92368 | 92546