Closed Bug 1259557 Opened 4 years ago Closed 4 years ago

Remove some INSTALL_TARGETS from toolkit/mozapps/update/tests/Makefile.in

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(firefox48 fixed)

RESOLVED FIXED
mozilla48
Tracking Status
firefox48 --- fixed

People

(Reporter: mshal, Assigned: mshal)

Details

Attachments

(1 file)

No description provided.
We don't have a way to filter out a file from a wildcard, so we have to
expand data/* in the moz.build file. Alternatively, we could move
xpcshellConstantsPP.js into a separate directory.

Review commit: https://reviewboard.mozilla.org/r/42297/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/42297/
Attachment #8734502 - Flags: review?(ted)
Comment on attachment 8734502 [details]
MozReview Request: Bug 1259557 - Remove some INSTALL_TARGETS from toolkit/mozapps/update/tests/Makefile.in; r?ted

https://reviewboard.mozilla.org/r/42297/#review39743

::: toolkit/mozapps/update/tests/moz.build:61
(Diff revision 1)
>      DEFINES['_UNICODE'] = True
>      USE_STATIC_LIBS = True
>      if CONFIG['GNU_CC']:
>          WIN32_EXE_LDFLAGS += ['-municode']
> +
> +TEST_HARNESS_FILES.testing.mochitest.chrome.toolkit.mozapps.update.tests.data += [

Boy, that's a mouthful.

::: toolkit/mozapps/update/tests/moz.build:100
(Diff revision 1)
> +    'data/simple.mar',
> +    'data/wrong_product_channel.mar',
> +    'data/xpcshellUtilsAUS.js',
> +]
> +
> +if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['MOZ_PROFILE_GENERATE']:

Seems like we could just change `FINAL_TARGET` where this program gets built, right?
https://dxr.mozilla.org/mozilla-central/rev/d5d53a3b4e50b94cdf85d20690526e5a00d5b63e/toolkit/mozapps/update/tests/moz.build#20

(I can't actually find that anything uses the TestAUSReadStrings binary from that same directory: https://dxr.mozilla.org/mozilla-central/search?q=TestAUSReadStrings&case=true )
(In reply to Ted Mielczarek [:ted.mielczarek] from comment #2)
> Comment on attachment 8734502 [details]
> MozReview Request: Bug 1259557 - Remove some INSTALL_TARGETS from
> toolkit/mozapps/update/tests/Makefile.in; r?ted
> 
> https://reviewboard.mozilla.org/r/42297/#review39743
> 
> ::: toolkit/mozapps/update/tests/moz.build:61
> (Diff revision 1)
> >      DEFINES['_UNICODE'] = True
> >      USE_STATIC_LIBS = True
> >      if CONFIG['GNU_CC']:
> >          WIN32_EXE_LDFLAGS += ['-municode']
> > +
> > +TEST_HARNESS_FILES.testing.mochitest.chrome.toolkit.mozapps.update.tests.data += [
> 
> Boy, that's a mouthful.
> 
> ::: toolkit/mozapps/update/tests/moz.build:100
> (Diff revision 1)
> > +    'data/simple.mar',
> > +    'data/wrong_product_channel.mar',
> > +    'data/xpcshellUtilsAUS.js',
> > +]
> > +
> > +if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['MOZ_PROFILE_GENERATE']:
> 
> Seems like we could just change `FINAL_TARGET` where this program gets
> built, right?

Good idea - that simplifies things.
Comment on attachment 8734502 [details]
MozReview Request: Bug 1259557 - Remove some INSTALL_TARGETS from toolkit/mozapps/update/tests/Makefile.in; r?ted

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/42297/diff/1-2/
Attachment #8734502 - Flags: review?(ted)
Comment on attachment 8734502 [details]
MozReview Request: Bug 1259557 - Remove some INSTALL_TARGETS from toolkit/mozapps/update/tests/Makefile.in; r?ted

https://reviewboard.mozilla.org/r/42297/#review40141

This Makefile is terrible. (I guess most of what we have left is!)
Attachment #8734502 - Flags: review?(ted) → review+
https://hg.mozilla.org/mozilla-central/rev/bb405b563fc3
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla48
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.