Bug 1509175 - MnH has to use a resolution of 1600x1200 instead of 1366x768 for virtual screen. r=ato
authorHenrik Skupin <mail@hskupin.info>
Fri, 23 Nov 2018 08:24:41 +0000
changeset 504231 a52096a533cb182c987a3752e6622eadddaab121
parent 504230 4afd2f3b8f33bf61287313fdfa609a325386dd06
child 504232 be33905d0aca61fca9527907dfc56156db4ffdca
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1509175
milestone65.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 1509175 - MnH has to use a resolution of 1600x1200 instead of 1366x768 for virtual screen. r=ato Differential Revision: https://phabricator.services.mozilla.com/D12626
testing/mozharness/scripts/marionette.py
testing/mozharness/scripts/web_platform_tests.py
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -92,16 +92,30 @@ class MarionetteTest(TestingMixin, Mercu
     ], [
         ["--headless"],
         {"action": "store_true",
          "dest": "headless",
          "default": False,
          "help": "Run tests in headless mode.",
          }
     ], [
+        ["--headless-width"],
+        {"action": "store",
+         "dest": "headless_width",
+         "default": "1600",
+         "help": "Specify headless virtual screen width (default: 1600).",
+         }
+    ], [
+        ["--headless-height"],
+        {"action": "store",
+         "dest": "headless_height",
+         "default": "1200",
+         "help": "Specify headless virtual screen height (default: 1200).",
+         }
+    ], [
        ["--allow-software-gl-layers"],
        {"action": "store_true",
         "dest": "allow_software_gl_layers",
         "default": False,
         "help": "Permits a software GL implementation (such as LLVMPipe) to use the GL compositor."
         }
     ], [
        ["--enable-webrender"],
@@ -286,19 +300,16 @@ class MarionetteTest(TestingMixin, Mercu
                                 self.config['test_manifest'])
 
         if self.config.get('app_arg'):
             config_fmt_args['app_arg'] = self.config['app_arg']
 
         if not self.config['e10s']:
             cmd.append('--disable-e10s')
 
-        if self.config['headless']:
-            cmd.append('--headless')
-
         cmd.append('--gecko-log=-')
 
         if self.config.get("structured_output"):
             cmd.append("--log-raw=-")
 
         for arg in self.config["suite_definitions"][self.test_suite]["options"]:
             cmd.append(arg % config_fmt_args)
 
@@ -325,16 +336,21 @@ class MarionetteTest(TestingMixin, Mercu
         env['RUST_BACKTRACE'] = 'full'
 
         if self.config['allow_software_gl_layers']:
             env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
         if self.config['enable_webrender']:
             env['MOZ_WEBRENDER'] = '1'
             env['MOZ_ACCELERATED'] = '1'
 
+        if self.config['headless']:
+            env['MOZ_HEADLESS'] = '1'
+            env['MOZ_HEADLESS_WIDTH'] = self.config['headless_width']
+            env['MOZ_HEADLESS_HEIGHT'] = self.config['headless_height']
+
         if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
             self.mkdir_p(env['MOZ_UPLOAD_DIR'])
         env = self.query_env(partial_env=env)
 
         try:
             cwd = self._query_tests_dir()
         except Exception as e:
             self.fatal("Don't know how to run --test-suite '{0}': {1}!".format(
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -71,23 +71,23 @@ class WebPlatformTest(TestingMixin, Merc
             "dest": "headless",
             "default": False,
             "help": "Run tests in headless mode."}
          ],
         [["--headless-width"], {
             "action": "store",
             "dest": "headless_width",
             "default": "1600",
-            "help": "Specify headless fake screen width (default: 1600)."}
+            "help": "Specify headless virtual screen width (default: 1600)."}
          ],
         [["--headless-height"], {
             "action": "store",
             "dest": "headless_height",
             "default": "1200",
-            "help": "Specify headless fake screen height (default: 1200)."}
+            "help": "Specify headless virtual screen height (default: 1200)."}
          ],
         [["--single-stylo-traversal"], {
             "action": "store_true",
             "dest": "single_stylo_traversal",
             "default": False,
             "help": "Forcibly enable single thread traversal in Stylo with STYLO_THREADS=1"}
          ],
         [["--setpref"], {