Bug 1583364 - Create a 'build_flavor' key mapping 'moztest.resolve.TEST_SUITES' to their build flavor, r=gbrown

Build flavors are defined in 'python/mozbuild/mozbuild/testing.py'.

This change is needed by D52729 but it's also a good way to tell which suites
are integrated into the TestManifestBackend in the build system. So I'm landing
it here instead.

Depends on D53030

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew Halberstadt 2019-11-19 00:30:21 +00:00
parent 06bf4f86d4
commit a1d66863ae

View File

@ -27,6 +27,7 @@ MOCHITEST_TOTAL_CHUNKS = 5
def WebglSuite(name):
return {
'aliases': (name,),
'build_flavor': 'mochitest',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'plain', 'subsuite': name, 'test_paths': None},
'task_regex': ['mochitest-' + name + '($|.*(-1|[^0-9])$)',
@ -42,6 +43,7 @@ TEST_SUITES = {
},
'crashtest': {
'aliases': ('c', 'rc'),
'build_flavor': 'crashtest',
'mach_command': 'crashtest',
'kwargs': {'test_file': None},
'task_regex': ['crashtest($|.*(-1|[^0-9])$)',
@ -76,6 +78,7 @@ TEST_SUITES = {
},
'mochitest-a11y': {
'aliases': ('a11y', 'ally'),
'build_flavor': 'a11y',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'a11y', 'test_paths': None, 'e10s': False},
'task_regex': ['mochitest-a11y($|.*(-1|[^0-9])$)',
@ -83,6 +86,7 @@ TEST_SUITES = {
},
'mochitest-browser-chrome': {
'aliases': ('bc', 'browser'),
'build_flavor': 'browser-chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'test_paths': None},
'task_regex': ['mochitest-browser-chrome($|.*(-1|[^0-9])$)',
@ -90,12 +94,14 @@ TEST_SUITES = {
},
'mochitest-browser-chrome-screenshots': {
'aliases': ('ss', 'screenshots-chrome'),
'build_flavor': 'browser-chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'screenshots', 'test_paths': None},
'task_regex': ['browser-screenshots($|.*(-1|[^0-9])$)'],
},
'mochitest-chrome': {
'aliases': ('mc',),
'build_flavor': 'chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'chrome', 'test_paths': None, 'e10s': False},
'task_regex': ['mochitest-chrome($|.*(-1|[^0-9])$)',
@ -103,6 +109,7 @@ TEST_SUITES = {
},
'mochitest-chrome-gpu': {
'aliases': ('gpu',),
'build_flavor': 'chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'chrome', 'subsuite': 'gpu', 'test_paths': None, 'e10s': False},
'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
@ -110,6 +117,7 @@ TEST_SUITES = {
},
'mochitest-devtools-chrome': {
'aliases': ('dt', 'devtools'),
'build_flavor': 'browser-chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'devtools', 'test_paths': None},
'task_regex': ['mochitest-devtools-chrome($|.*(-1|[^0-9])$)',
@ -117,6 +125,7 @@ TEST_SUITES = {
},
'mochitest-media': {
'aliases': ('mpm', 'plain-media'),
'build_flavor': 'mochitest',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'plain', 'subsuite': 'media', 'test_paths': None},
'task_regex': ['mochitest-media($|.*(-1|[^0-9])$)',
@ -124,6 +133,7 @@ TEST_SUITES = {
},
'mochitest-plain': {
'aliases': ('mp', 'plain',),
'build_flavor': 'mochitest',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'plain', 'test_paths': None},
'task_regex': ['mochitest(?!-a11y|-browser|-chrome|-devtools|-gpu|-harness|-media|-screen|-webgl)($|.*(-1|[^0-9])$)', # noqa
@ -131,6 +141,7 @@ TEST_SUITES = {
},
'mochitest-plain-gpu': {
'aliases': ('gpu',),
'build_flavor': 'mochitest',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'plain', 'subsuite': 'gpu', 'test_paths': None},
'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
@ -138,6 +149,7 @@ TEST_SUITES = {
},
'mochitest-remote': {
'aliases': ('remote',),
'build_flavor': 'browser-chrome',
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'remote', 'test_paths': None},
'task_regex': ['mochitest-remote($|.*(-1|[^0-9])$)',
@ -154,17 +166,20 @@ TEST_SUITES = {
'kwargs': {'headless': False},
},
'python': {
'build_flavor': 'python',
'mach_command': 'python-test',
'kwargs': {'tests': None},
},
'telemetry-tests-client': {
'aliases': ('ttc',),
'build_flavor': 'telemetry-tests-client',
'mach_command': 'telemetry-tests-client',
'kwargs': {},
'task_regex': ['telemetry-tests-client($|.*(-1|[^0-9])$)'],
},
'reftest': {
'aliases': ('rr',),
'build_flavor': 'reftest',
'mach_command': 'reftest',
'kwargs': {'tests': None},
'task_regex': ['(opt|debug)-reftest($|.*(-1|[^0-9])$)',
@ -210,12 +225,25 @@ TEST_SUITES = {
},
'xpcshell': {
'aliases': ('x',),
'build_flavor': 'xpcshell',
'mach_command': 'xpcshell-test',
'kwargs': {'test_file': 'all'},
'task_regex': ['xpcshell($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
},
}
"""Definitions of all test suites and the metadata needed to run and process
them. Each test suite definition can contain the following keys.
Arguments:
aliases (tuple): A tuple containing shorthands used to refer to this suite.
build_flavor (str): The flavor assigned to this suite by the build system
in `mozbuild.testing.TEST_MANIFESTS` (or similar).
mach_command (str): Name of the mach command used to run this suite.
kwargs (dict): Arguments needed to pass into the mach command.
task_regex (list): A list of regexes used to filter task labels that run
this suite.
"""
for i in range(1, MOCHITEST_TOTAL_CHUNKS + 1):
TEST_SUITES['mochitest-%d' % i] = {