Last Comment Bug 780835 - Intermittent build/macosx/universal/unify failure: "copyIfIdentical: files differ"
: Intermittent build/macosx/universal/unify failure: "copyIfIdentical: files di...
Status: RESOLVED FIXED
[red]
: intermittent-failure
Product: Core
Classification: Components
Component: Build Config (show other bugs)
: unspecified
: All Mac OS X
: -- critical (vote)
: mozilla17
Assigned To: Mike Hommey [:glandium]
:
:
Mentors:
Depends on:
Blocks: 438871 797452
  Show dependency treegraph
 
Reported: 2012-08-07 01:27 PDT by Mike Hommey [:glandium]
Modified: 2014-10-15 12:03 PDT (History)
2 users (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
Unify test manifest files with sort (1.30 KB, patch)
2012-08-07 09:47 PDT, Mike Hommey [:glandium]
ted: review+
Details | Diff | Splinter Review

Description Mike Hommey [:glandium] 2012-08-07 01:27:58 PDT
Mac universal builds sometime fail with errors like this:
/builds/slave/m-in-osx64/build/build/macosx/universal/unify: copyIfIdentical: files differ:
  obj-firefox/i386/dist/test-package-stage/mochitest/extensions/specialpowers/chrome.manifest,
  obj-firefox/x86_64/dist/test-package-stage/mochitest/extensions/specialpowers/chrome.manifest
Comment 1 Ted Mielczarek [:ted.mielczarek] 2012-08-07 06:03:57 PDT
This is probably an line-ordering issue. Can we sort the contents? I added that feature to unify a while ago.
Comment 3 Mike Hommey [:glandium] 2012-08-07 09:43:39 PDT
(In reply to Ted Mielczarek [:ted] from comment #1)
> This is probably an line-ordering issue. Can we sort the contents? I added
> that feature to unify a while ago.

The full log is:
           /builds/slave/m-in-osx64/build/build/macosx/universal/unify                 \
             --unify-with-sort "all-test-dirs\.list$"               \
             obj-firefox/i386/dist/test-package-stage                          \
             obj-firefox/x86_64/dist/test-package-stage                          \
             obj-firefox/i386/dist/universal/test-package-stage; fi
/builds/slave/m-in-osx64/build/build/macosx/universal/unify: copyIfIdentical: files differ:
  obj-firefox/i386/dist/test-package-stage/mochitest/extensions/specialpowers/chrome.manifest,
  obj-firefox/x86_64/dist/test-package-stage/mochitest/extensions/specialpowers/chrome.manifest

The sorting option *is* used. So either it doesn't work, or there *are* differences in the files. Can someone check on the failing buildbots?
Comment 4 Mike Hommey [:glandium] 2012-08-07 09:44:32 PDT
Ah, the argument that follows the option is a regexp for the file names to use it on.
Comment 5 Mike Hommey [:glandium] 2012-08-07 09:47:54 PDT
Created attachment 649677 [details] [diff] [review]
Unify test manifest files with sort
Comment 6 Ted Mielczarek [:ted.mielczarek] 2012-08-07 09:49:16 PDT
Comment on attachment 649677 [details] [diff] [review]
Unify test manifest files with sort

Review of attachment 649677 [details] [diff] [review]:
-----------------------------------------------------------------

Sorting manifests doesn't screw us up with regards to the content, does it?
Comment 7 Mike Hommey [:glandium] 2012-08-07 09:55:27 PDT
(In reply to Ted Mielczarek [:ted] from comment #6)
> Comment on attachment 649677 [details] [diff] [review]
> Unify test manifest files with sort
> 
> Review of attachment 649677 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Sorting manifests doesn't screw us up with regards to the content, does it?

We already sort them on non-test unification, see http://mxr.mozilla.org/mozilla-central/source/build/macosx/universal/flight.mk#77
Comment 9 Phil Ringnalda (:philor) 2012-08-07 21:39:57 PDT
https://tbpl.mozilla.org/php/getParsedLog.php?id=14211783&tree=Mozilla-Inbound

/builds/slave/m-in-osx64/build/build/macosx/universal/unify: copyIfIdentical: files differ:
  obj-firefox/i386/dist/firefox/FirefoxNightly.app/Contents/MacOS/application.ini,
  obj-firefox/x86_64/dist/firefox/FirefoxNightly.app/Contents/MacOS/application.ini
make[2]: *** [postflight_all] Error 1


which is rather quite a lot later than that push.
Comment 10 Phil Ringnalda (:philor) 2012-08-07 22:32:57 PDT
Hmm, and https://tbpl.mozilla.org/php/getParsedLog.php?id=14212839&tree=Mozilla-Inbound is the same slave, which probably means I need to clobber the lot of them, to make sure I get anybody who managed to hit the bustage.
Comment 11 Phil Ringnalda (:philor) 2012-08-07 23:09:52 PDT
https://tbpl.mozilla.org/php/getParsedLog.php?id=14214222&tree=Mozilla-Inbound before I got to the clobberer.
Comment 12 Ed Morley [:emorley] 2012-08-08 09:35:28 PDT
https://hg.mozilla.org/mozilla-central/rev/ce9504d8a2a2

Note You need to log in before you can comment on or make changes to this bug.