Closed Bug 1043963 Opened 5 years ago Closed 5 years ago

Collapse test-only moz.build files under dom/ into ancestor moz.build files

Categories

(Core :: DOM: Core & HTML, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
mozilla34

People

(Reporter: Ms2ger, Assigned: Ms2ger)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

No description provided.
There is very little benefit to having another layer of moz.build files, and
removing them will speed up the build a minimal amount. It also paves the way
for removing TEST_DIRS, which could simplify the build system somewhat.
Attachment #8462576 - Flags: review?(ted)
Comment on attachment 8462576 [details] [diff] [review]
Collapse test-only moz.build files under dom/ into ancestor moz.build files

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

::: dom/icc/moz.build
@@ +3,5 @@
>  # This Source Code Form is subject to the terms of the Mozilla Public
>  # License, v. 2.0. If a copy of the MPL was not distributed with this
>  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>  
>  PARALLEL_DIRS += ['interfaces', 'src']

Presumably we could ditch this moz.build and move these DIRS invocations up a level as well.

::: dom/network/moz.build
@@ +5,5 @@
>  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>  
>  PARALLEL_DIRS += ['interfaces', 'src']
> +
> +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini', 'tests/unit_ipc/xpcshell.ini']

multi-line list please.

::: dom/system/moz.build
@@ +14,5 @@
>      DIRS += ['mac']
>  elif toolkit == 'android':
>      DIRS += ['android']
>  elif toolkit == 'gonk':
>      DIRS += ['gonk']

Seems like we could rewrite this whole thing to just have mac in an if block, and otherwise set DIRS += [toolkit].

::: dom/xslt/tests/buster/moz.build
@@ -3,5 @@
> -# This Source Code Form is subject to the terms of the Mozilla Public
> -# License, v. 2.0. If a copy of the MPL was not distributed with this
> -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> -
> -JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file

I'm not sure that you can remove this and have it work properly. I think jar.mn still needs its own Makefile. (glandium or gps might know better than I though.) I would bet nobody cares about xslt/tests/buster anyway, though.
Attachment #8462576 - Flags: review?(ted) → review+
https://hg.mozilla.org/mozilla-central/rev/416e7822ac49
Status: ASSIGNED → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla34
Comment on attachment 8462576 [details] [diff] [review]
Collapse test-only moz.build files under dom/ into ancestor moz.build files

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

This stops running network stats xpcshell tests.

::: dom/network/moz.build
@@ +8,5 @@
> +
> +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini', 'tests/unit_ipc/xpcshell.ini']
> +
> +if CONFIG['tests/MOZ_B2G_RIL']:
> +    XPCSHELL_TESTS_MANIFESTS += ['tests/unit_stats/xpcshell.ini']

if CONFIG['MOZ_B2G_RIL']:
Doh, sorry about that.
QA Whiteboard: [qa-]
Component: DOM → DOM: Core & HTML
You need to log in before you can comment on or make changes to this bug.