Bug 1296086 - Add a firefox media tests flag to allow GL composition on a software GL implementation. r=jmaher
authorAndrew Comminos <andrew@comminos.com>
Thu, 18 Aug 2016 16:06:24 -0400
changeset 309973 9c167f078b80f8939d129a0ab781edd99fa737b9
parent 309972 f5120a79b034c935786c838f2dc496821f5d7e26
child 309974 e7b45868aa75fe8c3d6c47e9c819ed8bf36deb53
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 firefox media tests flag to allow GL composition on a software GL implementation. r=jmaher MozReview-Commit-ID: KDBHqsJojdw
testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
@@ -63,16 +63,22 @@ media_test_config_options = [
       "help": "suite name",
       }],
     [['--browsermob-script'],
      {'help': 'path to the browsermob-proxy shell script or batch file',
      }],
     [['--browsermob-port'],
      {'help': 'port to run the browsermob proxy on',
      }],
+    [["--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))
 
 class JobResultParser(TestSummaryOutputParserHelper):
     """ Parses test output to determine overall result."""
     def __init__(self, **kwargs):
         super(JobResultParser, self).__init__(**kwargs)
         self.return_code = 0
         # External-resource errors that should not count as test failures
@@ -265,16 +271,19 @@ class FirefoxMediaTestsBase(TestingMixin
             log_obj=self.log_obj,
             error_list=self.error_list
         )
 
         env = self.query_env()
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
 
+        if self.config['allow_software_gl_layers']:
+            env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
+
         return_code = self.run_command(
             cmd,
             output_timeout=self.test_timeout,
             output_parser=self.job_result_parser,
             env=env
         )
         self.job_result_parser.return_code = return_code
         return self.job_result_parser.status