Bug 1143218 - Use mochitest subsuites to specify webgl tests. r=jmaher,gbrown
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 18 Mar 2015 17:19:22 -0700
changeset 263625 e3be61bda115337d29101e00ae0f5361af537e4e
parent 263624 17cc5b0baea7c974bc01e67e2b5891ee26027dab
child 263626 fd0834bbfd3c76ab39675e4998bcff5a230570a2
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, gbrown
bugs1143218
milestone39.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 1143218 - Use mochitest subsuites to specify webgl tests. r=jmaher,gbrown
dom/canvas/test/_webgl-conformance.ini
dom/canvas/test/mochitest-subsuite-webgl.ini
dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
dom/canvas/test/webgl-conformance/mochitest-errata.ini
dom/canvas/test/webgl-mochitest.ini
testing/config/mozharness/android_arm_4_3_config.py
testing/config/mozharness/android_arm_config.py
testing/mochitest/runtests.py
testing/mozharness/mozharness.json
--- a/dom/canvas/test/_webgl-conformance.ini
+++ b/dom/canvas/test/_webgl-conformance.ini
@@ -1,14 +1,15 @@
 # This is a GENERATED FILE. Do not edit it directly.
 # Regenerated it by using `python generate-wrappers-and-manifest.py`.
 # Mark skipped tests in mochitest-errata.ini.
 # 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
                 webgl-conformance/always-fail.html
                 webgl-conformance/conformance/00_readme.txt
                 webgl-conformance/conformance/00_test_list.txt
                 webgl-conformance/conformance/LICENSE_CHROMIUM
                 webgl-conformance/conformance/attribs/00_test_list.txt
--- 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]
--- a/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
+++ b/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
@@ -25,18 +25,19 @@ SUPPORT_DIRS = [
 EXTRA_SUPPORT_FILES = [
     'always-fail.html',
     'iframe-autoresize.js',
     'mochi-single.html',
     '../webgl-mochitest/driver-info.js',
 ]
 
 ACCEPTABLE_ERRATA_KEYS = set([
+  'fail-if',
   'skip-if',
-  'fail-if',
+  'subsuite',
 ])
 
 GENERATED_HEADER = '''
 # This is a GENERATED FILE. Do not edit it directly.
 # Regenerated it by using `python generate-wrappers-and-manifest.py`.
 # Mark skipped tests in mochitest-errata.ini.
 # Mark failing tests in mochi-single.html.
 '''.strip()
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
@@ -1,15 +1,16 @@
 # *** WARNING! ***
 # Modification to this file only take effect after running
 # generate-wrappers-and-manifest.py
 
 # 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
 # bugs.
 # Bug 1136181 disabled on B2G Desktop and Mulet for intermittent failures
 skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
 
 ########################################################################
--- a/dom/canvas/test/webgl-mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+subsuite = webgl
 skip-if = ((os == 'linux') && (buildapp == 'b2g'))
 
 support-files =
   webgl-mochitest/driver-info.js
   webgl-mochitest/webgl-util.js
 
 [webgl-mochitest/test_backbuffer_channels.html]
 fail-if = (os == 'b2g')
--- a/testing/config/mozharness/android_arm_4_3_config.py
+++ b/testing/config/mozharness/android_arm_4_3_config.py
@@ -20,18 +20,18 @@ config = {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": ["--autorun", "--close-when-done", "--dm_trans=adb",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
                 "--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": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": ["--autorun", "--close-when-done", "--dm_trans=adb",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
--- a/testing/config/mozharness/android_arm_config.py
+++ b/testing/config/mozharness/android_arm_config.py
@@ -23,17 +23,17 @@ config = {
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
                 "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--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=4",
-                "--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
+                "--subsuite=webgl",
             ],
         },
         "robocop": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -575,19 +575,17 @@ class MochitestUtilsMixin(object):
             options.logFile = ""
         if not hasattr(options, 'fileLevel'):
             options.fileLevel = 'INFO'
 
         # allow relative paths for logFile
         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)
         else:
             if options.autorun:
                 self.urlOpts.append("autorun=1")
             if options.timeout:
                 self.urlOpts.append("timeout=%d" % options.timeout)
--- 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"
 }