Bug 1646801 - Fix mach test with wpt, r=ahal

Don't require setting include as an empty list. Use the subsuite name if known.

Differential Revision: https://phabricator.services.mozilla.com/D80500

testing/mozbase/moztest/moztest/resolve.py

@@ -221,7 +221,7 @@ TEST_SUITES = {
     'web-platform-tests-crashtest': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
-        'kwargs': {'include': []},
+        'kwargs': {'subsuite': 'crashtest'},
         'task_regex': ['web-platform-tests-crashtest($|.*(-1|[^0-9])$)',
                        'test-verify-wpt'],
     },
@@ -236,7 +236,7 @@ TEST_SUITES = {
     'web-platform-tests-wdspec': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
-        'kwargs': {'include': []},
+        'kwargs': {'subsuite': 'wdspec'},
         'task_regex': ['web-platform-tests-wdspec($|.*(-1|[^0-9])$)',
                        'test-verify-wpt'],
     },

testing/web-platform/mach_commands.py

@@ -349,8 +349,14 @@ class MachCommands(MachCommandBase):
             if params["product"] is None:
                 params["product"] = "firefox_android"
         if "test_objects" in params:
+            include = []
+            test_types = set()
             for item in params["test_objects"]:
-                params["include"].append(item["name"])
+                include.append(item["name"])
+                test_types.add(item.get("subsuite"))
+            if None not in test_types:
+                params["test_types"] = list(test_types)
+            params["include"] = include
             del params["test_objects"]
         if params.get('debugger', None):
             import mozdebug