Consolidate moz.build files containing just test manifests

NEW
Unassigned

Status

defect
6 years ago
2 years ago

People

(Reporter: gps, Unassigned)

Tracking

Trunk

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [leave open])

Attachments

(6 attachments)

We have a number of moz.build files that only define test manifests. Manifests can be moved into parent directory moz.build files and moz.build files can be eliminated. This will make the build system faster due to less I/O and possibly even fewer directories to traverse during make.
Posted patch netwerkSplinter Review
Fix netwerk/
Attachment #8371724 - Flags: review?(ted)
Assignee: nobody → gps
Status: NEW → ASSIGNED
I'm going to upload a gazillion files and then squash them before push.
Attachment #8371724 - Flags: review?(ted) → review+
Attachment #8371726 - Flags: review?(ted)
Attachment #8371726 - Flags: review?(ted) → review+
Attachment #8371752 - Flags: review?(ted)
Attachment #8371752 - Flags: review?(ted) → review+
Attachment #8371772 - Flags: review?(ted)
Try rebased on top of central since inbound was busted. I should know better.

https://tbpl.mozilla.org/?tree=Try&rev=8e6542d5b85a
Posted patch accessibleSplinter Review
Attachment #8371830 - Flags: review?(ted)
Posted patch browserSplinter Review
Attachment #8371850 - Flags: review?(ted)
https://tbpl.mozilla.org/?tree=Try&rev=81157d310516 is everything up through browser. That's 99 moz.build files eliminated!
FWIW, this doesn't appear to have a significant impact on no-op build times on OS X, GNU make, and an SSD. |mach build| is holding steady around 1:17.
Comment on attachment 8371772 [details] [diff] [review]
toolkit/components

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

::: toolkit/components/commandlines/moz.build
@@ +7,5 @@
> +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
> +
> +if CONFIG['OS_ARCH'] == 'WINNT':
> +    XPCSHELL_TESTS_MANIFESTS += ['test/unit_win/xpcshell.ini']
> +elif CONFIG['OS_ARCH'] not in ('Darwin', 'OS2'):

We've fully dropped OS/2 now, you could just make this != 'Darwin'
Attachment #8371772 - Flags: review?(ted) → review+
Comment on attachment 8371850 [details] [diff] [review]
browser

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

::: browser/devtools/styleinspector/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/.
>  
>  TEST_DIRS += ['test']

Why didn't this get removed?

::: browser/devtools/styleinspector/test/moz.build
@@ +1,5 @@
>  # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
>  # vim: set filetype=python:
>  # 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/.

And this file?
Attachment #8371850 - Flags: review?(ted) → review+
Comment on attachment 8371830 [details] [diff] [review]
accessible

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

::: accessible/tests/mochitest/events/moz.build
@@ +1,5 @@
>  # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
>  # vim: set filetype=python:
>  # 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/.

I think the patch I have gets rid of the Makefile here.
Attachment #8371830 - Flags: review?(ted) → review+
Merged the first 3 patches and pushed:

https://hg.mozilla.org/integration/mozilla-inbound/rev/637e219bdb5e

There are try issues with the others. I think I may have accidentally enabled a test or two that was previously disabled. Will hold off landing until try comes back clean.
Flags: in-testsuite-
Whiteboard: [leave open]
(In reply to Ted Mielczarek [:ted.mielczarek] from comment #13)
> Comment on attachment 8371850 [details] [diff] [review]
> browser
> 
> Review of attachment 8371850 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: browser/devtools/styleinspector/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/.
> >  
> >  TEST_DIRS += ['test']
> 
> Why didn't this get removed?

There is a Makefile.in. Granted, it could probably be converted to support-files. But I didn't want to risk bit rot.

> 
> ::: browser/devtools/styleinspector/test/moz.build
> @@ +1,5 @@
> >  # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
> >  # vim: set filetype=python:
> >  # 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/.
> 
> And this file?

Ditto.
Assignee: gps → nobody
Status: ASSIGNED → NEW
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.