From 5da1c39c6119a071e24d42e480863f45b5db472c Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 18 Mar 2015 17:19:22 -0700
Subject: [PATCH] Bug 1143218 - Use mochitest subsuites to specify webgl tests.
 r=jmaher,gbrown

---
 dom/canvas/test/_webgl-conformance.ini                        | 1 +
 dom/canvas/test/mochitest-subsuite-webgl.ini                  | 2 ++
 .../test/webgl-conformance/generate-wrappers-and-manifest.py  | 3 ++-
 dom/canvas/test/webgl-conformance/mochitest-errata.ini        | 1 +
 dom/canvas/test/webgl-mochitest.ini                           | 1 +
 testing/config/mozharness/android_arm_4_3_config.py           | 4 ++--
 testing/config/mozharness/android_arm_config.py               | 2 +-
 testing/mochitest/runtests.py                                 | 4 +---
 testing/mozharness/mozharness.json                            | 2 +-
 9 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dom/canvas/test/_webgl-conformance.ini b/dom/canvas/test/_webgl-conformance.ini
index 280b2bf38340..b8e8ccdcec58 100644
--- a/dom/canvas/test/_webgl-conformance.ini
+++ b/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
diff --git a/dom/canvas/test/mochitest-subsuite-webgl.ini b/dom/canvas/test/mochitest-subsuite-webgl.ini
index b415045d061c..6ed6e959ee55 100644
--- a/dom/canvas/test/mochitest-subsuite-webgl.ini
+++ b/dom/canvas/test/mochitest-subsuite-webgl.ini
@@ -1,3 +1,5 @@
 [DEFAULT]
+subsuite = webgl
+
 [include:_webgl-conformance.ini]
 [include:webgl-mochitest.ini]
diff --git a/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py b/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
index b80aea00d2c6..2658b1088e5f 100644
--- a/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
+++ b/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 = '''
diff --git a/dom/canvas/test/webgl-conformance/mochitest-errata.ini b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
index 6e9c18c2cbe8..d79193bb7d1b 100644
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ b/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
diff --git a/dom/canvas/test/webgl-mochitest.ini b/dom/canvas/test/webgl-mochitest.ini
index 1e0a0bf91803..319f0e6449b2 100644
--- a/dom/canvas/test/webgl-mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+subsuite = webgl
 skip-if = ((os == 'linux') && (buildapp == 'b2g'))
 
 support-files =
diff --git a/testing/config/mozharness/android_arm_4_3_config.py b/testing/config/mozharness/android_arm_4_3_config.py
index 68dd1a6ceba2..fa27cc35c42c 100644
--- a/testing/config/mozharness/android_arm_4_3_config.py
+++ b/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": {
diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py
index 37d32b3240f8..45e0e931362b 100644
--- a/testing/config/mozharness/android_arm_config.py
+++ b/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": {
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index fb3c819966fd..a0dbc519e7b4 100644
--- a/testing/mochitest/runtests.py
+++ b/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)
diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json
index 2408f3a7dcf1..8937a49a1d09 100644
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "75c435ef19ca"
+    "revision": "7b5d3fcc48c6"
 }