1259683 - ./configure --help broken after bug 1257823

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

0:00.65   File "/home/glandium/gecko/browser/../toolkit/moz.configure", line 36, in <module>
 0:00.65     imply_option('--enable-profiling', jprof)
 0:00.65   File "/home/glandium/gecko/python/mozbuild/mozbuild/configure/__init__.py", line 467, in imply_option_impl
 0:00.65     value = self._resolve(value, need_help_dependency=False)
 0:00.65   File "/home/glandium/gecko/python/mozbuild/mozbuild/configure/__init__.py", line 212, in _resolve
 0:00.65     assert func in self._results
 0:00.65 AssertionError

Comment 1

[Mike Hommey [:glandium]]

Attachment: MozReview Request: Bug 1259683 - Miscellaneous small cleanups in the mozbuild.configure module. r?nalexander

This is not related to the bug, but are drive-by cleanups.

Review commit: https://reviewboard.mozilla.org/r/42397/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/42397/

Comment 2

[Mike Hommey [:glandium]]

Attachment: MozReview Request: Bug 1259683 - Forgotten change to test_configure.py before landing bug 1257823. r?nalexander

This was suggested during review, and was applied to 2 of the 3 patches
where this applied, and the imply_option tests were left out. This fixes
it.

Review commit: https://reviewboard.mozilla.org/r/42399/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/42399/

Comment 3

[Mike Hommey [:glandium]]

Attachment: MozReview Request: Bug 1259683 - Don't make imply_option() do anything when --help is on the command line. r?nalexander

This also adds the same tests that exist for set_config and set_define
and that would have caught the `configure --help` breakage this change
fixes.

Review commit: https://reviewboard.mozilla.org/r/42401/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/42401/

Comment 4

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Comment on attachment 8734630 [details]
MozReview Request: Bug 1259683 - Miscellaneous small cleanups in the mozbuild.configure module. r?nalexander

https://reviewboard.mozilla.org/r/42397/#review39033

::: python/mozbuild/mozbuild/configure/__init__.py:357
(Diff revision 1)
>          Templates allow to simplify repetitive constructs, or to implement
>          helper decorators and somesuch.
>          '''
>          template, glob = self._prepare_function(func)
>          glob.update(
> -            advanced=self.advanced_impl,
> +            (k[:-5], getattr(self, k))

I've always liked `k:[-len('_impl')]` in these cases.  Your call.

Comment 5

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Comment on attachment 8734631 [details]
MozReview Request: Bug 1259683 - Forgotten change to test_configure.py before landing bug 1257823. r?nalexander

https://reviewboard.mozilla.org/r/42399/#review39035

Comment 6

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Comment on attachment 8734632 [details]
MozReview Request: Bug 1259683 - Don't make imply_option() do anything when --help is on the command line. r?nalexander

https://reviewboard.mozilla.org/r/42401/#review39037

I missed it the first time through.  And now it's tested!

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/174b56d80f69
https://hg.mozilla.org/integration/mozilla-inbound/rev/e2fe62b540c6
https://hg.mozilla.org/integration/mozilla-inbound/rev/98fd214bd3f2

Comment 8

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/174b56d80f69
https://hg.mozilla.org/mozilla-central/rev/e2fe62b540c6
https://hg.mozilla.org/mozilla-central/rev/98fd214bd3f2