923273 - Convert MOCHITEST_METRO_FILES to test manifests

Status: RESOLVED FIXED

(Firefox for Metro Graveyard :: Build Config, defect)

Description

[Matt Brubeck (:mbrubeck)]

Attachment: patch

Bug 901990 added manifest files for mochitests, but it missed the metro-chrome mochitests.  This patch adds a METRO_CHROME_MANIFESTS moz.build variable and replaces Makefiles with manifests for all metro-chrome tests.

Because the manifest can't use relative paths starting with ".." I have changed the way that "../mochitest/head.js" is loaded in the "mochiperf" tests, and renamed mochiperf/perfhelpers.js to mochiperf/head.js.  (Note that the Splinter review tool does not always display renames correctly; look at the raw diff if Splinter is confusing.)

Comment 1

[Gregory Szorc [:gps]]

Comment on attachment 813295 [details] [diff] [review]
patch

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

I didn't perform an exhaustive audit that the list of files matched up. But the build bits all look good.

::: browser/metro/base/tests/mochiperf/metro.ini
@@ +20,5 @@
> +skip-if = debug
> +[browser_layers_01.js]
> +skip-if = debug
> +[browser_firstx.js]
> +skip-if = debug

Instead of redefining "skip-if = debug" for every entry, you can put this assignment under the [DEFAULT] section and it will get inherited by every section.

Comment 2

[Matt Brubeck (:mbrubeck)]

https://tbpl.mozilla.org/?tree=Try&rev=d2614bacd88b

Comment 3

[Matt Brubeck (:mbrubeck)]

Attachment: patch v2

Rebased, addressed review comment, and got rid of empty moz.build files.  Carrying r=gps.  Switching Metro reviewer, for load balancing.

Comment 4

[Rodrigo Silveira [:rsilveira] [:rodms]]

Comment on attachment 814258 [details] [diff] [review]
patch v2

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

Looks good.

::: browser/metro/base/tests/mochitest/metro.ini
@@ +20,5 @@
> +  head.js
> +  helpers/BookmarksHelper.js
> +  helpers/HistoryHelper.js
> +  helpers/ViewStateHelper.js
> +  res/image01.png

I couldn't find the corresponding removal of browser\metro\base\tests\mochitest\res\Makefile.in

::: python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/metro.ini
@@ +1,3 @@
> +[DEFAULT]
> +
> +[test_metro.js]

Do we need to create an empty file in like the other js files in this dir?

Comment 5

[Matt Brubeck (:mbrubeck)]

https://hg.mozilla.org/integration/fx-team/rev/ce7d9ece6243

Comment 6

[Matt Brubeck (:mbrubeck)]

(I fixed the review comments before landing, and added a missing test change that was preventing the test from failing.)

Comment 7

[Carsten Book [:Tomcat]]

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