Bug 1143218 - Use mochitest subsuites to specify webgl tests. r=jmaher,gbrown

dom/canvas/test/_webgl-conformance.ini

@@ -4,6 +4,7 @@
 # Mark failing tests in mochi-single.html.
 
 [DEFAULT]
+subsuite = webgl
 skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
 
 support-files = webgl-conformance/../webgl-mochitest/driver-info.js

dom/canvas/test/mochitest-subsuite-webgl.ini

@@ -1,3 +1,5 @@
 [DEFAULT]
+subsuite = webgl
+
 [include:_webgl-conformance.ini]
 [include:webgl-mochitest.ini]

dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py

@@ -30,8 +30,9 @@ EXTRA_SUPPORT_FILES = [
 ]
 
 ACCEPTABLE_ERRATA_KEYS = set([
-  'skip-if',
   'fail-if',
+  'skip-if',
+  'subsuite',
 ])
 
 GENERATED_HEADER = '''

dom/canvas/test/webgl-conformance/mochitest-errata.ini

@@ -5,6 +5,7 @@
 # See python/mozbuild/mozbuild/mozinfo.py for incoming data.
 
 [DEFAULT]
+subsuite = webgl
 # No e10s yet.
 # 'B2G Desktop Linux' fails to create WebGL contexts.
 # Also skip B2G for now, until we get a handle on the longer tail of emulator

dom/canvas/test/webgl-mochitest.ini

@@ -1,4 +1,5 @@
 [DEFAULT]
+subsuite = webgl
 skip-if = ((os == 'linux') && (buildapp == 'b2g'))
 
 support-files =

testing/config/mozharness/android_arm_4_3_config.py

@@ -25,8 +25,8 @@ config = {
                 "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
                 "--quiet", "--log-raw=%(raw_log_file)s",
-                "--total-chunks=2",
-                "--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
+                "--total-chunks=4",
+                "--subsuite=webgl",
             ],
         },
         "robocop": {

testing/config/mozharness/android_arm_config.py

@@ -28,7 +28,7 @@ config = {
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
                 "--quiet", "--log-raw=%(raw_log_file)s",
                 "--total-chunks=4",
-                "--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
+                "--subsuite=webgl",
             ],
         },
         "robocop": {

testing/mochitest/runtests.py

@@ -580,9 +580,7 @@ class MochitestUtilsMixin(object):
         if options.logFile:
             options.logFile = self.getLogFilePath(options.logFile)
 
-        # Note that all tests under options.subsuite need to be browser chrome
-        # tests.
-        if options.browserChrome or options.chrome or options.subsuite or \
+        if options.browserChrome or options.chrome or \
            options.a11y or options.webapprtChrome or options.jetpackPackage or \
            options.jetpackAddon:
             self.makeTestConfig(options)

testing/mozharness/mozharness.json

@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "75c435ef19ca"
+    "revision": "7b5d3fcc48c6"
 }