Bug 1188730 - Select tests in the plugins subsuite by manifest rather than path to fix unintended interaction with mach try. r=ahal
authorChris Manchester <cmanchester@mozilla.com>
Wed, 29 Jul 2015 00:10:06 -0700
changeset 287183 41dadd801de3066d9dff42713d824fc9890ff9c9
parent 287182 b0d4af6d3d2a6ea986f61b57470cbad0827d32b8
child 287184 4a09252567e2e07f599665c0ddcd718c9dc18656
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1188730
milestone42.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 1188730 - Select tests in the plugins subsuite by manifest rather than path to fix unintended interaction with mach try. r=ahal This prevents mach try's filtering of the master mochitest manifest from interacting with the plugins subsuite by selecting by manifest rather than test path. The way we run mochitest other could use a lot of cleanup -- this is a quick fix to prevent misleading output on treeherder when using mach try.
testing/mochitest/mochitest_options.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -153,23 +153,16 @@ class MochitestArguments(ArgumentContain
           "suppress": True,
           }],
         [["--chrome"],
          {"action": "store_true",
           "default": False,
           "help": "Run chrome mochitests.",
           "suppress": True,
           }],
-        [["--ipcplugins"],
-         {"action": "store_true",
-          "dest": "ipcplugins",
-          "help": "Run ipcplugins mochitests.",
-          "default": False,
-          "suppress": True,
-          }],
         [["--bisect-chunk"],
          {"dest": "bisectChunk",
           "default": None,
           "help": "Specify the failing test name to find the previous tests that may be "
                   "causing the failure.",
           }],
         [["--start-at"],
          {"dest": "startAt",
@@ -547,19 +540,16 @@ class MochitestArguments(ArgumentContain
             gmp_modules = (
                 ('gmp-fake', '1.0'),
                 ('gmp-clearkey', '0.1'),
                 ('gmp-fakeopenh264', '1.0')
             )
             options.gmp_path = os.pathsep.join(
                 os.path.join(build_obj.bindir, *p) for p in gmp_modules)
 
-        if options.ipcplugins:
-            options.test_paths.append('dom/plugins/test/mochitest')
-
         if options.totalChunks is not None and options.thisChunk is None:
             parser.error(
                 "thisChunk must be specified when totalChunks is specified")
 
         if options.totalChunks:
             if not 1 <= options.thisChunk <= options.totalChunks:
                 parser.error("thisChunk must be between 1 and totalChunks")
 
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -73,17 +73,17 @@ config = {
         "mochitest-gl": ["--subsuite=webgl"],
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "jetpack-package": ["--jetpack-package"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
         "plugins": ['--setpref=dom.ipc.plugins.enabled=false',
                     '--setpref=dom.ipc.plugins.enabled.x86_64=false',
-                    '--ipcplugins']
+                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
         "chrome": ["--webapprt-chrome", "--browser-arg=-test-mode"],
         "content": ["--webapprt-content"]
     },
     # local reftest suites
     "all_reftest_suites": {
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -62,17 +62,17 @@ config = {
         "mochitest-gl": ["--subsuite=webgl"],
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "jetpack-package": ["--jetpack-package"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
         "plugins": ['--setpref=dom.ipc.plugins.enabled=false',
                     '--setpref=dom.ipc.plugins.enabled.x86_64=false',
-                    '--ipcplugins']
+                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
         "chrome": ["--webapprt-chrome", "--browser-arg=-test-mode"],
         "content": ["--webapprt-content"]
     },
     # local reftest suites
     "all_reftest_suites": {
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -73,17 +73,17 @@ config = {
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-metro-chrome": ["--browser-chrome", "--metro-immersive"],
         "jetpack-package": ["--jetpack-package"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
         "plugins": ['--setpref=dom.ipc.plugins.enabled=false',
                     '--setpref=dom.ipc.plugins.enabled.x86_64=false',
-                    '--ipcplugins']
+                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
         "chrome": ["--webapprt-chrome", "--browser-arg=-test-mode"],
         "content": ["--webapprt-content"]
     },
     # local reftest suites
     "all_reftest_suites": {