From 09aeeca068cd75e9459d1d1c159e57e3c59bbae9 Mon Sep 17 00:00:00 2001
From: b4hand <bforehand@mozilla.com>
Date: Mon, 20 May 2019 08:59:56 +0000
Subject: [PATCH] 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
---
 python/mozbuild/mozbuild/frontend/context.py          |  3 +++
 python/mozbuild/mozbuild/testing.py                   |  4 ++++
 testing/mozbase/moztest/moztest/resolve.py            |  7 +++++++
 .../components/telemetry/tests/marionette/moz.build   | 11 +++++++++++
 toolkit/toolkit.mozbuild                              |  1 +
 5 files changed, 26 insertions(+)
 create mode 100644 toolkit/components/telemetry/tests/marionette/moz.build

diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 2e3242937616..a0efc2a853cb 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1908,6 +1908,9 @@ VARIABLES = {
         """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.
     'XPI_NAME': (unicode, unicode,
diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py
index 2e5a6b6efafe..9418940fb43b 100644
--- a/python/mozbuild/mozbuild/testing.py
+++ b/python/mozbuild/mozbuild/testing.py
@@ -49,6 +49,10 @@ TEST_MANIFESTS = dict(
     PUPPETEER_FIREFOX=('firefox-ui-functional', 'firefox-ui', '.', False),
     PYTHON_UNITTEST=('python', 'python', '.', False),
     CRAMTEST=('cram', 'cram', '.', False),
+    TELEMETRY_TESTS_CLIENT=(
+        'telemetry-tests-client',
+        'toolkit/components/telemetry/tests/marionette', '.', False
+    ),
 
     # marionette tests are run from the srcdir
     # TODO(ato): make packaging work as for other test suites
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 98c742ba881d..a849f70f5024 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -144,6 +144,12 @@ TEST_SUITES = {
         'mach_command': 'python-test',
         'kwargs': {'tests': None},
     },
+    'telemetry-tests-client': {
+        'aliases': ('ttc',),
+        'mach_command': 'telemetry-tests-client',
+        'kwargs': {},
+        'task_regex': ['telemetry-tests-client($|.*(-1|[^0-9])$)'],
+    },
     'reftest': {
         'aliases': ('rr',),
         'mach_command': 'reftest',
@@ -224,6 +230,7 @@ _test_flavors = {
     'python': 'python',
     'reftest': 'reftest',
     'steeplechase': '',
+    'telemetry-tests-client': 'telemetry-tests-client',
     'web-platform-tests': 'web-platform-tests',
     'xpcshell': 'xpcshell',
 }
diff --git a/toolkit/components/telemetry/tests/marionette/moz.build b/toolkit/components/telemetry/tests/marionette/moz.build
new file mode 100644
index 000000000000..464949739aba
--- /dev/null
+++ b/toolkit/components/telemetry/tests/marionette/moz.build
@@ -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"]
\ No newline at end of file
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 99de2b0437fc..94b9b96a3fba 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -167,6 +167,7 @@ if CONFIG['ENABLE_MARIONETTE']:
     DIRS += [
         '/testing/firefox-ui',
         '/testing/marionette',
+        '/toolkit/components/telemetry/tests/marionette',
     ]
 
 if CONFIG['ENABLE_GECKODRIVER'] and not CONFIG['MOZ_TSAN'] and not CONFIG['FUZZING_INTERFACES']: