From cb177987ea164e1aa14306daa48f081131772972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Mon, 17 Aug 2015 20:34:25 +0200
Subject: [PATCH] Bug 1194789 - Disable mochitest-ipcplugins and remove
 mochitest-ipcplugins code. r=jgriffin

---
 testing/mach_commands.py                      |  3 ---
 .../configs/unittests/linux_unittest.py       |  3 ---
 .../configs/unittests/mac_unittest.py         |  3 ---
 .../configs/unittests/win_unittest.py         |  3 ---
 testing/testsuite-targets.mk                  | 21 +------------------
 5 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/testing/mach_commands.py b/testing/mach_commands.py
index 85ecc767896..c23a567a958 100644
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -80,9 +80,6 @@ TEST_SUITES = {
         'mach_command': 'mochitest',
         'kwargs': {'subsuite': 'devtools', 'test_paths': None},
     },
-    'mochitest-ipcplugins': {
-        'make_target': 'mochitest-ipcplugins',
-    },
     'mochitest-plain': {
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'test_paths': None},
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 7ef9b1664de..813c2c2a11c 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -76,9 +76,6 @@ config = {
         "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',
-                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py
index 8985948d34c..6937d30523e 100644
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -65,9 +65,6 @@ config = {
         "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',
-                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index b2291b70811..529f1921579 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -76,9 +76,6 @@ config = {
         "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',
-                    '--manifest=tests/dom/plugins/test/mochitest/mochitest.ini']
     },
     # local webapprt suites
     "all_webapprt_suites": {
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index ab974d09499..59f93249d97 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -6,10 +6,8 @@
 # Shortcut for mochitest* and xpcshell-tests targets
 ifdef TEST_PATH
 TEST_PATH_ARG := '$(TEST_PATH)'
-IPCPLUGINS_PATH_ARG := '$(TEST_PATH)'
 else
 TEST_PATH_ARG :=
-IPCPLUGINS_PATH_ARG := dom/plugins/test
 endif
 
 # include automation-build.mk to get the path to the binary
@@ -19,7 +17,7 @@ include $(topsrcdir)/build/binary-location.mk
 SYMBOLS_PATH := --symbols-path=$(DIST)/crashreporter-symbols
 
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] mochitest*|.
-MOCHITESTS := mochitest-plain mochitest-chrome mochitest-devtools mochitest-a11y mochitest-ipcplugins
+MOCHITESTS := mochitest-plain mochitest-chrome mochitest-devtools mochitest-a11y
 mochitest:: $(MOCHITESTS)
 
 ifndef TEST_PACKAGE_NAME
@@ -148,22 +146,6 @@ mochitest-a11y:
 	$(RUN_MOCHITEST) --a11y
 	$(CHECK_TEST_ERROR)
 
-mochitest-ipcplugins:
-ifeq (Darwin,$(OS_ARCH))
-ifeq (i386,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386.test.plugin=false $(IPCPLUGINS_PATH_ARG)
-endif
-ifeq (x86_64,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64.test.plugin=false $(IPCPLUGINS_PATH_ARG)
-endif
-ifeq (powerpc,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc.test.plugin=false $(IPCPLUGINS_PATH_ARG)
-endif
-else
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=false dom/plugins/test
-endif
-	$(CHECK_TEST_ERROR)
-
 ifeq ($(OS_ARCH),Darwin)
 webapprt_stub_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/webapprt-stub$(BIN_SUFFIX)
 endif
@@ -616,7 +598,6 @@ stage-instrumentation-tests: make-stage-dir
   mochitest-chrome \
   mochitest-devtools \
   mochitest-a11y \
-  mochitest-ipcplugins \
   reftest \
   crashtest \
   xpcshell-tests \