425003 - mozilla-central build fails when attempting to make a universal binary

Status: VERIFIED FIXED

(Tamarin Graveyard :: Build Config, defect)

Description

[[e-mail] (:bhearsum)]

We just turned on universal binaries in bug 424890 and the mac mozilla-central builds are failing now. actionmonkey hasn't run yet but I presume it will hit the same error. Here's a log snippet:
/builds/buildbot/moz2-slave/mozilla-central-macosx/build/build/macosx/universal/unify \
	  obj-firefox/ppc/dist/firefox/Minefield.app \
	  obj-firefox/i386/dist/firefox/Minefield.app \
	  obj-firefox/ppc/dist/universal/firefox/Minefield.app
/builds/buildbot/moz2-slave/mozilla-central-macosx/build/build/macosx/universal/unify: compareZipArchives: zip archives differ:
  obj-firefox/ppc/dist/firefox/Minefield.app/Contents/MacOS/chrome/reftest.jar,
  obj-firefox/i386/dist/firefox/Minefield.app/Contents/MacOS/chrome/reftest.jar
/builds/buildbot/moz2-slave/mozilla-central-macosx/build/build/macosx/universal/unify: compareZipArchives: members differ:
  content/autoconf.js

Full log is available here:
http://tinderbox.mozilla.org/showlog.cgi?log=Mozilla2/1206451219.1206454978.4436.gz&fulltext=1

Comment 1

[[e-mail] (:bhearsum)]

As it turns out, actionmonkey is failing with a different error. I filed bug 425005 on it.

Comment 2

[(not currently active) Ted Mielczarek]

You can get around that reftest thing by using --disable-tests.

Comment 3

[[e-mail] (:bhearsum)]

Attachment: [checked in] disable tests on mac

--enable-tests will have to work for unit tests, but we should probably be disabling them for build machines anyways.

Comment 4

[(not currently active) Ted Mielczarek]

Comment on attachment 311607 [details] [diff] [review]
[checked in] disable tests on mac

Yeah, but unit test boxes don't do universal builds. Alternately, my patch in bug 420084 would fix this as well.

Comment 5

[[e-mail] (:bhearsum)]

Comment on attachment 311607 [details] [diff] [review]
[checked in] disable tests on mac

changeset:   12:c2aeed592c37
tag:         tip
user:        Ben Hearsum <[e-mail]>
date:        Tue Mar 25 13:17:19 2008 -0400
files:       mozilla2/macosx/mozconfig

Comment 6

[[e-mail] (:bhearsum)]

Alright, I kicked a new build -- let's see how it goes.

Comment 7

[[e-mail] (:bhearsum)]

Attachment: [checked in] do packaging correctly for UB builds on mac

The last patch fixed mozilla-central builds but packaging is broken because it needs to be done from MOZ_OBJDIR/ppc.

This makes the config more ugly -- and I'm kindof regretting making it programmatic in the first place. Maybe factories are the right way to go. Going to stick with this for now, though.

Comment 8

[[e-mail] (:bhearsum)]

Whoops, I should've put this in bug 424890

Comment 9

[[e-mail] (:bhearsum)]

Comment on attachment 311774 [details] [diff] [review]
[checked in] do packaging correctly for UB builds on mac

changeset:   13:35a946cb785e
tag:         tip
user:        Ben Hearsum <[e-mail]>
date:        Fri Mar 28 08:05:14 2008 -0400
files:       mozilla2/master.cfg

Comment 10

[[e-mail] (:bhearsum)]

More problems. I'm working on them right now.

Comment 11

[[e-mail] (:bhearsum)]

Attachment: special-case mac objdir for GetBuildID/MozillaStageUpload

Comment 12

[[e-mail] (:bhearsum)]

Attachment: [checked in] add platform_objdir to avoid special-casing

As you suggested Nick, I've added platform_objdir. The other notable change is short-handing branch['platforms'][platform] because it's used so much in that loop. This is a teeny bit beyond the scope this patch but I think that's OK.

Comment 13

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 312272 [details] [diff] [review]
[checked in] add platform_objdir to avoid special-casing

Looks good to me, r+

Comment 14

[[e-mail] (:bhearsum)]

Comment on attachment 312272 [details] [diff] [review]
[checked in] add platform_objdir to avoid special-casing

changeset:   14:9ebc9aa43402
tag:         tip
user:        Ben Hearsum <[e-mail]>
date:        Fri Mar 28 10:35:04 2008 -0400
files:       mozilla2/master.cfg

Comment 15

[[e-mail] (:bhearsum)]

That did the trick.

Comment 16

[Chris Peyer]

Resolved fixed engineering / work item that has been pushed.  Setting status to
verified.