Bug 1331899 - Fix mozbuild for wpt manifest v4 changes, r=gps draft
authorJames Graham <james@hoppipolla.co.uk>
Fri, 06 Jan 2017 15:30:50 +0000
changeset 462969 743b837bfc24c502555f53de2f85d532dd0c0e42
parent 462968 9cd399f9900ebe2824bb7640f2302a972edf3e0f
child 462970 9630e7823a62abc6bfa2d29cc53dcc5ab0082771
push id41928
push userbmo:james@hoppipolla.co.uk
push dateWed, 18 Jan 2017 10:52:19 +0000
reviewersgps
bugs1331899
milestone53.0a1
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
@@ -1413,22 +1413,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': '',