Bug 1296086 - Add a marionette flag to allow GL composition on a software GL implementation. r=jmaher
authorAndrew Comminos <andrew@comminos.com>
Thu, 18 Aug 2016 15:43:21 -0400
changeset 309971 bef08c5c1348ef495e25ec2aa434c3c8629a1b82
parent 309970 a54b3ed2232f9ae81dcc8338f564f2f563256518
child 309972 f5120a79b034c935786c838f2dc496821f5d7e26
push id31517
push useracomminos@mozilla.com
push dateThu, 18 Aug 2016 22:08:52 +0000
treeherderautoland@e7b45868aa75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1296086
milestone51.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 1296086 - Add a marionette flag to allow GL composition on a software GL implementation. r=jmaher MozReview-Commit-ID: CnhlSlezqcT
testing/mozharness/scripts/marionette.py
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -124,16 +124,23 @@ class MarionetteTest(TestingMixin, Mercu
         }
      ], [
         ["--e10s"],
         {"action": "store_true",
          "dest": "e10s",
          "default": False,
          "help": "Run tests with multiple processes. (Desktop builds only)",
         }
+    ], [
+       ["--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."
+       }
      ]] + copy.deepcopy(testing_config_options) \
         + copy.deepcopy(blobupload_config_options)
 
     error_list = [
         {'substr': 'FAILED (errors=', 'level': WARNING},
         {'substr': r'''Could not successfully complete transport of message to Gecko, socket closed''', 'level': ERROR},
         {'substr': r'''Connection to Marionette server is lost. Check gecko''', 'level': ERROR},
         {'substr': 'Timeout waiting for marionette on port', 'level': ERROR},
@@ -422,16 +429,20 @@ class MarionetteTest(TestingMixin, Mercu
         env = {}
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         if self.config.get('gaiatest'):
             env['GAIATEST_ACKNOWLEDGED_RISKS'] = '1'
             env['GAIATEST_SKIP_WARNING'] = '1'
         env['MOZ_UPLOAD_DIR'] = self.query_abs_dirs()['abs_blob_upload_dir']
         env['MINIDUMP_SAVE_PATH'] = self.query_abs_dirs()['abs_blob_upload_dir']
+
+        if self.config['allow_software_gl_layers']:
+            env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
+
         if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
             self.mkdir_p(env['MOZ_UPLOAD_DIR'])
         env = self.query_env(partial_env=env)
 
         marionette_parser = self.parser_class(config=self.config,
                                               log_obj=self.log_obj,
                                               error_list=self.error_list)
         code = self.run_command(cmd, env=env,