Bug 1558598 - Fix the enable-webrender option for the telemetry Marionette tests. r=ato
authorKartikaya Gupta <kgupta@mozilla.com>
Sat, 29 Jun 2019 09:50:27 +0000
changeset 543519 ee677b549b512c7c782e254f0a555ab1be5cb148
parent 543518 f18f992a51b6c943e9eaa5b3e1ac4a17c5ee9032
child 543520 68c9521ac146923bf1cd8e34bb19825f805722fa
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1558598
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1558598 - Fix the enable-webrender option for the telemetry Marionette tests. r=ato Differential Revision: https://phabricator.services.mozilla.com/D35862
testing/mozharness/scripts/telemetry/telemetry_client.py
--- a/testing/mozharness/scripts/telemetry/telemetry_client.py
+++ b/testing/mozharness/scripts/telemetry/telemetry_client.py
@@ -33,17 +33,17 @@ telemetry_tests_config_options = [
         "default": False,
         "help": "Permits a software GL implementation (such as LLVMPipe) "
                 "to use the GL compositor.",
     }],
     [["--enable-webrender"], {
         "action": "store_true",
         "dest": "enable_webrender",
         "default": False,
-        "help": "Tries to enable the WebRender compositor.",
+        "help": "Enable the WebRender compositor in Gecko.",
     }],
     [['--dry-run'], {
         'dest': 'dry_run',
         'default': False,
         'help': 'Only show what was going to be tested.',
     }],
     [["--disable-e10s"], {
         'dest': 'e10s',
@@ -157,16 +157,19 @@ class TelemetryTests(TestingMixin, VCSTo
             '--log-raw=-',  # structured log for output parser redirected to stdout
             # additional reports helpful for Jenkins and inpection via Treeherder
             '--log-html', os.path.join(dirs['abs_blob_upload_dir'], 'report.html'),
             '--log-xunit', os.path.join(dirs['abs_blob_upload_dir'], 'report.xml'),
             # Enable tracing output to log transmission protocol
             '-vv',
         ]
 
+        if self.config['enable_webrender']:
+            cmd.extend(['--enable-webrender'])
+
         parser = StructuredOutputParser(config=self.config,
                                         log_obj=self.log_obj,
                                         strict=False)
 
         # Add the default tests to run
         tests = [os.path.join(dirs['abs_telemetry_dir'], 'tests', test)
                  for test in self.default_tests]
         cmd.extend(tests)