Merge mozilla-central to autoland. a=merge CLOSED TREE

taskcluster/taskgraph/transforms/tests.py

@@ -263,8 +263,10 @@ CHUNK_SUITES_BLACKLIST = (
     'test-verify-gpu',
     'test-verify-wpt',
     'web-platform-tests-backlog',
+    'web-platform-tests-crashtest',
     'web-platform-tests-print-reftest',
     'web-platform-tests-reftest-backlog',
+    'web-platform-tests-wdspec',
 )
 """These suites will be chunked at test runtime rather than here in the taskgraph."""
 

testing/mozbase/moztest/moztest/resolve.py

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