Attachment 196050 Details for Bug 345127 – patch to switch to macosx cocoa x86_64 for testing

[patch] patch to switch to macosx cocoa x86_64 for testing

345127a.txt (text/plain), 7.46 KB, created by Kim Moir

on 2011-05-18 16:35:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2011-05-18 16:35:57 EDT

Size: 7.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/sdk.tests/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/customTargets.xml,v
>retrieving revision 1.41
>diff -u -r1.41 customTargets.xml
>--- eclipse/buildConfigs/sdk.tests/customTargets.xml	23 Mar 2011 17:13:47 -0000	1.41
>+++ eclipse/buildConfigs/sdk.tests/customTargets.xml	18 May 2011 20:35:16 -0000
>@@ -233,10 +233,10 @@
> 		<property name="equinoxp2tests.properties" value="${workingDirectory}/eclipse-testing/equinoxp2tests.properties" />
> 		<property name="org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32" value="c:\\buildtest\\${buildId}\\eclipse-testing\\eclipse-platform-${buildId}-win32.zip" />
> 		<property name="org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux" value="/buildtest/${buildId}/eclipse-testing/eclipse-platform-${buildId}-linux-gtk.tar.gz" />
>-		<property name="org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx" value="/Users/ibmemployee/buildtest/${buildId}/eclipse-testing/eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />
>+		<property name="org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx" value="/Users/ibmemployee/buildtest/${buildId}/eclipse-testing/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz" />
> 		<property name="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32" value="c:\\buildtest\\${buildId}\\eclipse-testing\\eclipse-platform-3.6.2-win32.zip" />
> 		<property name="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux" value="/buildtest/${buildId}/eclipse-testing/eclipse-platform-3.6.2-linux-gtk.tar.gz" />
>-		<property name="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx" value="/Users/ibmemployee/buildtest/${buildId}/eclipse-testing/eclipse-platform-3.6.2-macosx-cocoa.tar.gz" />
>+		<property name="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx" value="/Users/ibmemployee/buildtest/${buildId}/eclipse-testing/eclipse-platform-3.6.2-macosx-cocoa-x86_64.tar.gz" />
> 		<propertyfile file="${equinoxp2tests.properties}" comment="Properties required by equinox p2 tests">
> 			<entry key="org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32" value="${org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32}" />
> 			<entry key="org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux" value="${org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux}" />
>@@ -306,7 +306,7 @@
> 			<arg line="-q -O ${previousPlatformZips}/eclipse-platform-3.6.2-linux-gtk.tar.gz http://${localmirror}/downloads/drops/R-3.6.2-201102101200/eclipse-platform-3.6.2-linux-gtk.tar.gz" />
> 		</exec>
> 		<exec executable="/usr/bin/wget" dir="${previousPlatformZips}" failonerror="false">
>-			<arg line="-q -O ${previousPlatformZips}/eclipse-platform-3.6.2-macosx-cocoa.tar.gz http://${localmirror}/downloads/drops/R-3.6.2-201102101200/eclipse-platform-3.6.2-macosx-cocoa.tar.gz" />
>+			<arg line="-q -O ${previousPlatformZips}/eclipse-platform-3.6.2-macosx-cocoa-x86_64.tar.gz http://${localmirror}/downloads/drops/R-3.6.2-201102101200/eclipse-platform-3.6.2-macosx-cocoa-x86_64.tar.gz" />
> 		</exec>
> 	</target>
> 
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testAll.sh
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testAll.sh,v
>retrieving revision 1.1
>diff -u -r1.1 testAll.sh
>--- eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testAll.sh	26 Mar 2009 15:44:15 -0000	1.1
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testAll.sh	18 May 2011 20:35:16 -0000
>@@ -2,5 +2,5 @@
> ulimit -c unlimited
> 
> #execute command to run tests
>-./runtests -os macosx -ws cocoa -arch x86 -properties `pwd`/vm.properties 1> macosx.cocoa_consolelog.txt 2>&1
>+./runtests -os macosx -ws cocoa -arch x86_64 -properties `pwd`/vm.properties 1> macosx.cocoa_consolelog.txt 2>&1
> 
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testing.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testing.properties,v
>retrieving revision 1.6
>diff -u -r1.6 testing.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testing.properties	23 Mar 2011 17:13:48 -0000	1.6
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/macosx/testing.properties	18 May 2011 20:35:16 -0000
>@@ -18,14 +18,14 @@
> testFramework=eclipse-Automated-Tests-${buildId}.zip
> 
> #name of runtime to install and test
>-runtime=eclipse-SDK-${buildId}-macosx-cocoa.tar.gz
>+runtime=eclipse-SDK-${buildId}-macosx-cocoa-x86_64.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}-macosx-cocoa.tar.gz
>-previousRuntimePlatform=eclipse-platform-3.6.2-macosx-cocoa.tar.gz
>+runtimePlatform=eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
>+previousRuntimePlatform=eclipse-platform-3.6.2-macosx-cocoa-x86_64.tar.gz
> 
> #directory where test scripts are launched
> executionDir=${testDir}/eclipse-testing
>Index: eclipse/buildConfigs/sdk.tests/testConfigs/macosx/vm.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/macosx/vm.properties,v
>retrieving revision 1.2
>diff -u -r1.2 vm.properties
>--- eclipse/buildConfigs/sdk.tests/testConfigs/macosx/vm.properties	9 May 2011 17:35:02 -0000	1.2
>+++ eclipse/buildConfigs/sdk.tests/testConfigs/macosx/vm.properties	18 May 2011 20:35:16 -0000
>@@ -9,5 +9,5 @@
> #     IBM Corporation - initial API and implementation
> ###############################################################################
> platform=macosx.cocoa.x86_5.0
>-extraVMargs=-XstartOnFirstThread -d32
>+extraVMargs=-XstartOnFirstThread
> J2SE-5.0=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java
>Index: eclipse/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
>retrieving revision 1.151
>diff -u -r1.151 helper.xml
>--- eclipse/helper.xml	14 Jan 2011 13:24:39 -0000	1.151
>+++ eclipse/helper.xml	18 May 2011 20:35:16 -0000
>@@ -224,7 +224,7 @@
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-Automated-Tests-${buildId}.zip.md5" />
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-win32.zip.md5" />
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-linux-gtk.tar.gz.md5" />
>-				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-macosx-cocoa.tar.gz.md5" />
>+				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz.md5" />
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-${buildId}-delta-pack.zip.md5" />
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-platform-${buildId}-win32.zip.md5" />
> 				<available file="${postingDirectory}/${buildLabel}/checksum/eclipse-platform-${buildId}-linux-gtk.tar.gz.md5" />

Actions: View | Diff

Attachments on bug 345127: 195110 | 196050 | 196125 | 196163 | 196451