Port bug 526668 - add option to 'unify' to allow files to match if their sorted contents match

RESOLVED FIXED in Thunderbird 3.1a1

Status

MailNews Core
Build Config
RESOLVED FIXED
8 years ago
7 years ago

People

(Reporter: standard8, Assigned: standard8)

Tracking

Trunk
Thunderbird 3.1a1
All
Mac OS X
Dependency tree / graph
Bug Flags:
in-testsuite -

Thunderbird Tracking Flags

(thunderbird3.0 .5-fixed)

Details

Attachments

(3 attachments, 1 obsolete attachment)

+++ This bug was initially created as a clone of Bug #526668 +++

We have some files that wind up with the same contents in a slightly different order when you run a parallel build. The 'unify' script currently expects files to have identical contents, so these situations break universal builds easily. I have a patch that adds a --unify-with-sort <regex> option to unify, so we can pass in file patterns and have them special-cased. unify will sort the contents of the files and compare that instead.
Created attachment 411470 [details] [diff] [review]
The fix
[Checkin: Comment 2]

Ports the fix from bug 526668 and from bug 519357.
Assignee: nobody → bugzilla
Status: NEW → ASSIGNED
Attachment #411470 - Flags: review?(gozer)
Attachment #411470 - Flags: review?(gozer) → review+
Checked in:
http://hg.mozilla.org/comm-central/rev/588b16a4afb2
Flags: in-testsuite-
Status: ASSIGNED → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED
Depends on: 519357, 518641
Created attachment 430325 [details] [diff] [review]
(Bv1) Add missed "all-test-dirs.list", Unify indentation
[Checkin: See comment 4+5]

First patch was incomplete because bug 518641 had not be ported yet...

NB: All 'Bo' SeaMonkey builds are failing now and most probably need this.
Attachment #430325 - Flags: review?(gozer)
Attachment #430325 - Flags: review?(gozer) → review+
Comment on attachment 430325 [details] [diff] [review]
(Bv1) Add missed "all-test-dirs.list", Unify indentation
[Checkin: See comment 4+5]


http://hg.mozilla.org/comm-central/rev/7cb6c4474d90
(Bv1a) Unify indentation
http://hg.mozilla.org/comm-central/rev/b357570131ea
(Cv1) Complete bug 526668 port: add missed "all-test-dirs.list"
Attachment #430325 - Attachment description: (Bv1) Add missed "all-test-dirs.list", Unify indentation. → (Bv1) Add missed "all-test-dirs.list", Unify indentation [Checkin: See comment 4]
Comment on attachment 430325 [details] [diff] [review]
(Bv1) Add missed "all-test-dirs.list", Unify indentation
[Checkin: See comment 4+5]


(In reply to comment #4)

+
http://hg.mozilla.org/comm-central/rev/364f310598e3
(Dv1) Add missing '\'
Attachment #430325 - Attachment description: (Bv1) Add missed "all-test-dirs.list", Unify indentation [Checkin: See comment 4] → (Bv1) Add missed "all-test-dirs.list", Unify indentation [Checkin: See comment 4+5]
Created attachment 434699 [details] [diff] [review]
(Ev1-191) Backport to c-1.9.1 too
Attachment #434699 - Flags: review?(gozer)
Created attachment 434759 [details] [diff] [review]
(Ev1a-191) Backport to c-1.9.1 too
[Checkin: See comment 14]

Ev1-191, with Makefile.in part too.
Attachment #434699 - Attachment is obsolete: true
Attachment #434759 - Flags: review?(gozer)
Attachment #434699 - Flags: review?(gozer)
Attachment #434759 - Flags: review?(gozer) → review+
Attachment #434759 - Flags: approval-thunderbird3.0.5?
Comment on attachment 434759 [details] [diff] [review]
(Ev1a-191) Backport to c-1.9.1 too
[Checkin: See comment 14]

>diff --git a/Makefile.in b/Makefile.in
...
>+else
>+package-tests::
>+	$(MAKE) -C mozilla $@

This change doesn't seem related to this patch/bug and there's no explanation of why it is here.

Therefore a=Standard8 only without that change included in this patch.
Attachment #434759 - Flags: approval-thunderbird3.0.5? → approval-thunderbird3.0.5+
Comment on attachment 434759 [details] [diff] [review]
(Ev1a-191) Backport to c-1.9.1 too
[Checkin: See comment 14]


(In reply to comment #8)
> This change doesn't seem related to this patch/bug and there's no explanation
> of why it is here.

It is. The explanation is in comment 3: see patch Ev1-CC in that bug.
Attachment #434759 - Flags: feedback?(bugzilla)
Attachment #411470 - Attachment description: The fix → The fix [Checkin: Comment 2]
(In reply to comment #9)
> (From update of attachment 434759 [details] [diff] [review])
> 
> (In reply to comment #8)
> > This change doesn't seem related to this patch/bug and there's no explanation
> > of why it is here.
> 
> It is. The explanation is in comment 3: see patch Ev1-CC in that bug.

Comment 3 is not an explanation for Ev1-CC. Try looking at it from my perspective: Bv1 is a patch against trunk, it does not include any diffs like the package-tests one. Ev1-CC doesn't include any additional references.

Indeed I notice now its only in comment 3 that you added the dep for bug 518641 which wasn't an original focus of this bug and isn't part of the title/original intent of this bug. So the only connection is the link between 526668 and 518641 for the bit of your patch that doesn't seem to be required as no-one is broken.

In any case, I don't care about package-tests bit for comm-1.9.1. If SM really cares (and I'd be very surprised given SM2.0 tree is green), then please file a separate bug/patch on that.
Attachment #434759 - Flags: feedback?(bugzilla)
Blocks: 559088
Comment on attachment 434759 [details] [diff] [review]
(Ev1a-191) Backport to c-1.9.1 too
[Checkin: See comment 14]


http://hg.mozilla.org/releases/comm-1.9.1/rev/f4cd10d68090
Ev1a-191, with comment 10 suggestion(s).
Attachment #434759 - Attachment description: (Ev1a-191) Backport to c-1.9.1 too → (Ev1a-191) Backport to c-1.9.1 too [Checkin: Comment 11]
(In reply to comment #10)

> In any case, I don't care about package-tests bit for comm-1.9.1. If SM really

I disagree with your explanation, but anyway:
c-1.9.1 is currently out of sync' with the package-tests part(s) that went in m-1.9.1 (in the meantime).

> cares (and I'd be very surprised given SM2.0 tree is green), then please file a

SM 2.0 is not green but random-orange.
(Though I've stopped closely monitoring it for some time now.)

> separate bug/patch on that.

I filed bug 559088.
status-thunderbird3.0: --- → .5-fixed
Attachment #434759 - Attachment description: (Ev1a-191) Backport to c-1.9.1 too [Checkin: Comment 11] → (Ev1a-191) Backport to c-1.9.1 too [Checkin: See comment 11]
Blocks: 559184
(In reply to comment #11)
> (From update of attachment 434759 [details] [diff] [review])
> 
> http://hg.mozilla.org/releases/comm-1.9.1/rev/f4cd10d68090
> Ev1a-191, with comment 10 suggestion(s).

Backed out due to Thunderbird build bustage.

http://hg.mozilla.org/releases/comm-1.9.1/rev/f4cd10d68090

Next time, please comment on the bug and/or ping me direct if we get a similar issue. Starring the build and leaving the tree busted is not the right thing to do especially as 3.0 is less actively monitored these days as its not a development head.
status-thunderbird3.0: .5-fixed → ---
Attachment #434759 - Flags: approval-thunderbird3.0.5+ → approval-thunderbird3.0.5?
Whiteboard: [can only land once TB picks up latest m-c changes]
Whiteboard: [can only land once TB picks up latest m-c changes] → [can only land once TB picks up latest m-1.9.1 changes]
status-thunderbird3.0: --- → ?
status-thunderbird3.0: ? → ---
Checked in: http://hg.mozilla.org/releases/comm-1.9.1/rev/8d8c0bff4fce
status-thunderbird3.0: --- → .5-fixed
Attachment #434759 - Flags: approval-thunderbird3.0.5? → approval-thunderbird3.0.5+
Attachment #434759 - Attachment description: (Ev1a-191) Backport to c-1.9.1 too [Checkin: See comment 11] → (Ev1a-191) Backport to c-1.9.1 too [Checkin: See comment 14]
Whiteboard: [can only land once TB picks up latest m-1.9.1 changes]
Build-config only patch: as the build process is still working fine, verifying fixed for TB 3.0.5
Keywords: verified-thunderbird3.0
You need to log in before you can comment on or make changes to this bug.