Bug 1532607 - Add configuration to run telemetry tests directly; r=raphael,ahal

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
b4hand 2019-05-20 08:59:56 +00:00
parent 6b25c13613
commit 09aeeca068
5 changed files with 26 additions and 0 deletions

View File

@ -1908,6 +1908,9 @@ VARIABLES = {
"""List of manifest files defining cram unit tests. """List of manifest files defining cram unit tests.
"""), """),
'TELEMETRY_TESTS_CLIENT_MANIFESTS': (ManifestparserManifestList, list,
"""List of manifest files defining telemetry client tests.
"""),
# The following variables are used to control the target of installed files. # The following variables are used to control the target of installed files.
'XPI_NAME': (unicode, unicode, 'XPI_NAME': (unicode, unicode,

View File

@ -49,6 +49,10 @@ TEST_MANIFESTS = dict(
PUPPETEER_FIREFOX=('firefox-ui-functional', 'firefox-ui', '.', False), PUPPETEER_FIREFOX=('firefox-ui-functional', 'firefox-ui', '.', False),
PYTHON_UNITTEST=('python', 'python', '.', False), PYTHON_UNITTEST=('python', 'python', '.', False),
CRAMTEST=('cram', 'cram', '.', False), CRAMTEST=('cram', 'cram', '.', False),
TELEMETRY_TESTS_CLIENT=(
'telemetry-tests-client',
'toolkit/components/telemetry/tests/marionette', '.', False
),
# marionette tests are run from the srcdir # marionette tests are run from the srcdir
# TODO(ato): make packaging work as for other test suites # TODO(ato): make packaging work as for other test suites

View File

@ -144,6 +144,12 @@ TEST_SUITES = {
'mach_command': 'python-test', 'mach_command': 'python-test',
'kwargs': {'tests': None}, 'kwargs': {'tests': None},
}, },
'telemetry-tests-client': {
'aliases': ('ttc',),
'mach_command': 'telemetry-tests-client',
'kwargs': {},
'task_regex': ['telemetry-tests-client($|.*(-1|[^0-9])$)'],
},
'reftest': { 'reftest': {
'aliases': ('rr',), 'aliases': ('rr',),
'mach_command': 'reftest', 'mach_command': 'reftest',
@ -224,6 +230,7 @@ _test_flavors = {
'python': 'python', 'python': 'python',
'reftest': 'reftest', 'reftest': 'reftest',
'steeplechase': '', 'steeplechase': '',
'telemetry-tests-client': 'telemetry-tests-client',
'web-platform-tests': 'web-platform-tests', 'web-platform-tests': 'web-platform-tests',
'xpcshell': 'xpcshell', 'xpcshell': 'xpcshell',
} }

View File

@ -0,0 +1,11 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
TELEMETRY_TESTS_CLIENT_MANIFESTS += ["tests/manifest.ini"]
with Files("**"):
BUG_COMPONENT = ("Tookit", "Telemetry")
SCHEDULES.exclusive = ["telemetry-tests-client"]

View File

@ -167,6 +167,7 @@ if CONFIG['ENABLE_MARIONETTE']:
DIRS += [ DIRS += [
'/testing/firefox-ui', '/testing/firefox-ui',
'/testing/marionette', '/testing/marionette',
'/toolkit/components/telemetry/tests/marionette',
] ]
if CONFIG['ENABLE_GECKODRIVER'] and not CONFIG['MOZ_TSAN'] and not CONFIG['FUZZING_INTERFACES']: if CONFIG['ENABLE_GECKODRIVER'] and not CONFIG['MOZ_TSAN'] and not CONFIG['FUZZING_INTERFACES']: