Bug 1331899 - Fix mozbuild for wpt manifest v4 changes, r=gps
authorJames Graham <james@hoppipolla.co.uk>
Fri, 06 Jan 2017 15:30:50 +0000
changeset 375126 432c0dee9e826a15c3734b24df27cb8493484129
parent 375125 beb43155b7a647b841f051f9cb7ae65550634912
child 375127 474e53d47c3534a789cc19b49a029a6bcf3fbe9c
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1331899
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1331899 - Fix mozbuild for wpt manifest v4 changes, r=gps MozReview-Commit-ID: Hipksgmk5Nr
python/mozbuild/mozbuild/frontend/emitter.py
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1369,22 +1369,22 @@ class TreeMetadataEmitter(LoggingMixin):
         # Create a equivalent TestManifest object
         obj = TestManifest(context, manifest_full_path, manifest,
                            flavor="web-platform-tests",
                            relpath=mozpath.join(manifest_reldir,
                                                 mozpath.basename(manifest_path)),
                            install_prefix="web-platform/")
 
 
-        for path, tests in manifest:
+        for test_type, path, tests in manifest:
             path = mozpath.join(tests_root, path)
+            if test_type not in ["testharness", "reftest", "wdspec"]:
+                continue
+
             for test in tests:
-                if test.item_type not in ["testharness", "reftest"]:
-                    continue
-
                 obj.tests.append({
                     'path': path,
                     'here': mozpath.dirname(path),
                     'manifest': manifest_path,
                     'name': test.id,
                     'head': '',
                     'tail': '',
                     'support-files': '',