Bug 1194789 - Disable mochitest-ipcplugins and remove mochitest-ipcplugins code. r=jgriffin

This commit is contained in:
Julien Pagès 2015-08-17 20:34:25 +02:00
parent e0d874d12f
commit cb177987ea
5 changed files with 1 additions and 32 deletions

View File

@ -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},

View File

@ -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": {

View File

@ -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": {

View File

@ -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": {

View File

@ -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 \