1224165 - Remove some Makefiles in js/xpconnect/tests/

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[(not currently active) Ted Mielczarek]

I was looking at uses of INSTALL_TARGETS, and found these two:
https://dxr.mozilla.org/mozilla-central/source/js/xpconnect/tests/components/js/Makefile.in
https://dxr.mozilla.org/mozilla-central/source/js/xpconnect/tests/components/native/Makefile.in

I was able to replace those Makefiles with a combination of FINAL_TARGET + EXTRA_COMPONENTS in moz.build + adding a new xpcshell.ini with just a support-files section to copy files into the test dir.

I did have to tweak paths in some xpcshell tests, as letting the build system install the xpcom component means it winds up in `_tests/xpcshell/js/xpconnect/tests/components/native/components/` instead of just `.../native/`.

Comment 1

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1224165 - Remove some Makefiles in js/xpconnect/tests/. r?glandium

bug 1224165 - Remove some Makefiles in js/xpconnect/tests/. r?glandium

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8686563 [details]
MozReview Request: bug 1224165 - Remove some Makefiles in js/xpconnect/tests/. r?glandium

https://reviewboard.mozilla.org/r/25003/#review22597

::: js/xpconnect/tests/components/native/moz.build:7
(Diff revision 1)
> -DIST_INSTALL = False
> +FINAL_TARGET = '_tests/xpcshell/js/xpconnect/tests/components/native/'

That's gnarly, but it does the job.

::: js/xpconnect/tests/idl/moz.build:20
(Diff revision 1)
>      '!/dist/bin/components/xpctest.xpt',

Wouldn't setting FINAL_TARGETS here too work?

Comment 3

[(not currently active) Ted Mielczarek]

https://reviewboard.mozilla.org/r/25003/#review22597

> That's gnarly, but it does the job.

I was wondering if it was worth inventing a special case for this. I think this same pattern reoccurs in a couple of places.

> Wouldn't setting FINAL_TARGETS here too work?

I will have to try that.

Comment 4

[(not currently active) Ted Mielczarek]

I went to try that suggested change and realized that it won't work, because the tests want that same xpt file copied to two places. :-/

Comment 5

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/integration/mozilla-inbound/rev/068571096137ed86c98864eac60cc2b750b01688
bug 1224165 - Remove some Makefiles in js/xpconnect/tests/. r=glandium

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/068571096137