--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -134,20 +134,16 @@ class ReftestRunner(MozbuildObject):
raise Exception(ADB_NOT_FOUND % ('%s-remote' % args.suite, b2g_home))
args.b2gPath = b2g_home
args.logdir = self.reftest_dir
args.httpdPath = os.path.join(self.topsrcdir, 'netwerk', 'test', 'httpserver')
args.xrePath = xre_path
args.ignoreWindowSize = True
- # Don't enable oop for crashtest until they run oop in automation
- if args.suite == 'reftest':
- args.oop = True
-
return runreftestb2g.run_test_harness(parser, args)
def run_mulet_test(self, **kwargs):
"""Runs a mulet reftest."""
args = Namespace(**kwargs)
self._setup_objdir(args)
import runreftestmulet
@@ -165,20 +161,17 @@ class ReftestRunner(MozbuildObject):
if os.path.isfile(os.path.join(args.profile, 'extensions',
'httpd@gaiamobile.org')):
print(GAIA_PROFILE_IS_DEBUG % args.profile)
return 1
args.app = self.get_binary_path()
args.mulet = True
- args.oop = True
- if args.oop:
- args.browser_arg = '-oop'
if not args.app.endswith('-bin'):
args.app = '%s-bin' % args.app
if not os.path.isfile(args.app):
args.app = args.app[:-len('-bin')]
return runreftestmulet.run_test_harness(parser, args)
def run_desktop_test(self, **kwargs):
@@ -216,18 +209,16 @@ class ReftestRunner(MozbuildObject):
return rv
def run_android_test(self, **kwargs):
"""Runs a reftest, in Firefox for Android."""
args = Namespace(**kwargs)
if args.suite not in ('reftest', 'crashtest', 'jstestbrowser'):
raise Exception('None or unrecognized reftest suite type.')
- if hasattr(args, 'ipc'):
- raise Exception('IPC tests not supported on Android.')
self._setup_objdir(args)
import remotereftest
default_manifest = {
"reftest": (self.topsrcdir, "layout", "reftests", "reftest.list"),
"crashtest": (self.topsrcdir, "testing", "crashtest", "crashtests.list"),
"jstestbrowser": ("jsreftest", "tests", "jstests.list")
@@ -333,42 +324,24 @@ class MachCommands(MachCommandBase):
parser=get_parser)
def run_jstestbrowser(self, **kwargs):
self._mach_context.commands.dispatch("build",
self._mach_context,
what=["stage-jstests"])
kwargs["suite"] = "jstestbrowser"
return self._run_reftest(**kwargs)
- @Command('reftest-ipc',
- category='testing',
- description='Run IPC reftests (layout and graphics correctness, separate process).',
- parser=get_parser)
- def run_ipc(self, **kwargs):
- kwargs["ipc"] = True
- kwargs["suite"] = "reftest"
- return self._run_reftest(**kwargs)
-
@Command('crashtest',
category='testing',
description='Run crashtests (Check if crashes on a page).',
parser=get_parser)
def run_crashtest(self, **kwargs):
kwargs["suite"] = "crashtest"
return self._run_reftest(**kwargs)
- @Command('crashtest-ipc',
- category='testing',
- description='Run IPC crashtests (Check if crashes on a page, separate process).',
- parser=get_parser)
- def run_crashtest_ipc(self, **kwargs):
- kwargs["ipc"] = True
- kwargs["suite"] = "crashtest"
- return self._run_reftest(**kwargs)
-
def _run_reftest(self, **kwargs):
process_test_objects(kwargs)
reftest = self._spawn(ReftestRunner)
if conditions.is_android(self):
from mozrunner.devices.android_device import verify_android_device
verify_android_device(self, install=True, xre=True)
return reftest.run_android_test(**kwargs)
elif conditions.is_mulet(self):
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -312,43 +312,24 @@ class DesktopArgumentsParser(ReftestArgu
super(DesktopArgumentsParser, self).__init__(**kwargs)
self.add_argument("--run-tests-in-parallel",
action="store_true",
default=False,
dest="runTestsInParallel",
help="run tests in parallel if possible")
- self.add_argument("--ipc",
- action="store_true",
- default=False,
- help="Run in out-of-processes mode")
-
- def _prefs_oop(self):
- import mozinfo
- prefs = ["layers.async-pan-zoom.enabled=true",
- "browser.tabs.remote.autostart=true"]
- if mozinfo.os == "win":
- prefs.append("layers.acceleration.disabled=true")
-
- return prefs
-
def _prefs_gpu(self):
if mozinfo.os != "win":
return ["layers.acceleration.force-enabled=true"]
return []
def validate(self, options, reftest):
super(DesktopArgumentsParser, self).validate(options, reftest)
- if options.ipc:
- for item in self._prefs_oop():
- if item not in options.extraPrefs:
- options.extraPrefs.append(item)
-
if options.runTestsInParallel:
if options.logFile is not None:
self.error("cannot specify logfile with parallel tests")
if options.totalChunks is not None or options.thisChunk is not None:
self.error(
"cannot specify thisChunk or totalChunks with parallel tests")
if options.focusFilterMode != "all":
self.error("cannot specify focusFilterMode with parallel tests")
@@ -497,22 +478,16 @@ class B2GArgumentParser(ReftestArguments
"gaia profile to use")
self.add_argument("--mulet",
action="store_true",
dest="mulet",
default=False,
help="Run the tests on a B2G desktop build")
- self.add_argument("--enable-oop",
- action="store_true",
- dest="oop",
- default=False,
- help="Run the tests out of process")
-
self.set_defaults(remoteTestRoot=None,
logFile="reftest.log",
autorun=True,
closeWhenDone=True,
testPath="")
def validate_remote(self, options, automation):
if not options.app:
--- a/layout/tools/reftest/runreftestb2g.py
+++ b/layout/tools/reftest/runreftestb2g.py
@@ -256,20 +256,16 @@ class B2GRemoteReftest(RefTest):
prefs["app.update.url"] = ""
prefs["app.update.url.override"] = ""
# Disable webapp updates
prefs["webapps.update.enabled"] = False
# Disable tiles also
prefs["browser.newtabpage.directory.source"] = ""
prefs["browser.newtabpage.directory.ping"] = ""
- if options.oop:
- prefs['browser.tabs.remote.autostart'] = True
- prefs['reftest.browser.iframe.enabled'] = True
-
# Set the extra prefs.
profile.set_preferences(prefs)
# Copy the profile to the device.
self._devicemanager.removeDir(self.remoteProfile)
try:
self._devicemanager.pushDir(profileDir, self.remoteProfile)
except DMError:
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -51,21 +51,16 @@ TEST_SUITES = {
'mach_command': 'cppunittest',
'kwargs': {'test_file': None},
},
'crashtest': {
'aliases': ('C', 'Rc', 'RC', 'rc'),
'mach_command': 'crashtest',
'kwargs': {'test_file': None},
},
- 'crashtest-ipc': {
- 'aliases': ('Cipc', 'cipc'),
- 'mach_command': 'crashtest-ipc',
- 'kwargs': {'test_file': None},
- },
'firefox-ui-functional': {
'aliases': ('Fxfn',),
'mach_command': 'firefox-ui-functional',
'kwargs': {},
},
'firefox-ui-update': {
'aliases': ('Fxup',),
'mach_command': 'firefox-ui-update',
@@ -107,21 +102,16 @@ TEST_SUITES = {
'mach_command': 'python-test',
'kwargs': {'tests': None},
},
'reftest': {
'aliases': ('RR', 'rr', 'Rr'),
'mach_command': 'reftest',
'kwargs': {'tests': None},
},
- 'reftest-ipc': {
- 'aliases': ('Ripc',),
- 'mach_command': 'reftest-ipc',
- 'kwargs': {'test_file': None},
- },
'web-platform-tests': {
'aliases': ('wpt',),
'mach_command': 'web-platform-tests',
'kwargs': {}
},
'valgrind': {
'aliases': ('V', 'v'),
'mach_command': 'valgrind-test',
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -201,57 +201,33 @@ config = {
"mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"],
"jetpack-package": ["--flavor=jetpack-package"],
"jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"],
"jetpack-addon": ["--flavor=jetpack-addon"],
"a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {
- "reftest": {
- "options": ["--suite=reftest"],
- "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
- },
"crashtest": {
"options": ["--suite=crashtest"],
"tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
},
"jsreftest": {
"options": ["--extra-profile-file=tests/jsreftest/tests/user.js",
"--suite=jstestbrowser"],
"tests": ["tests/jsreftest/tests/jstests.list"]
},
- "reftest-ipc": {
- "env": {
- "MOZ_OMTC_ENABLED": "1",
- "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
- },
- "options": ["--suite=reftest",
- "--setpref=browser.tabs.remote=true",
- "--setpref=browser.tabs.remote.autostart=true",
- "--setpref=extensions.e10sBlocksEnabling=false",
- "--setpref=layers.async-pan-zoom.enabled=true"],
- "tests": ["tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list"]
+ "reftest": {
+ "options": ["--suite=reftest"],
+ "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
},
"reftest-no-accel": {
"options": ["--suite=reftest",
"--setpref=layers.acceleration.force-enabled=disabled"],
"tests": ["tests/reftest/tests/layout/reftests/reftest.list"]},
- "crashtest-ipc": {
- "env": {
- "MOZ_OMTC_ENABLED": "1",
- "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
- },
- "options": ["--suite=crashtest",
- "--setpref=browser.tabs.remote=true",
- "--setpref=browser.tabs.remote.autostart=true",
- "--setpref=extensions.e10sBlocksEnabling=false",
- "--setpref=layers.async-pan-zoom.enabled=true"],
- "tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
- },
},
"all_xpcshell_suites": {
"xpcshell": {
"options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/xpcshell.ini"],
"tests": []
},
"xpcshell-addons": {
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -166,43 +166,27 @@ config = {
"mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
"jetpack-package": ["--flavor=jetpack-package"],
"jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"],
"jetpack-addon": ["--flavor=jetpack-addon"],
"a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {
- "reftest": {
- 'options': ["--suite=reftest"],
- 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
- },
"crashtest": {
'options': ["--suite=crashtest"],
'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
},
"jsreftest": {
'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
'tests': ["tests/jsreftest/tests/jstests.list"]
},
- "reftest-ipc": {
- 'options': ['--suite=reftest',
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- 'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
- },
- "crashtest-ipc": {
- 'options': ['--suite=crashtest',
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- 'tests': ['tests/reftest/tests/testing/crashtest/crashtests.list']
+ "reftest": {
+ 'options': ["--suite=reftest"],
+ 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
},
},
"all_xpcshell_suites": {
"xpcshell": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': []
},
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -179,50 +179,34 @@ config = {
"mochitest-metro-chrome": ["--flavor=browser", "--metro-immersive"],
"jetpack-package": ["--flavor=jetpack-package"],
"jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"],
"jetpack-addon": ["--flavor=jetpack-addon"],
"a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {
- "reftest": {
- 'options': ["--suite=reftest"],
- 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
- },
"crashtest": {
'options': ["--suite=crashtest"],
'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
},
"jsreftest": {
'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
'tests': ["tests/jsreftest/tests/jstests.list"]
},
- "reftest-ipc": {
- 'options': ['--suite=reftest',
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- 'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
+ "reftest": {
+ 'options': ["--suite=reftest"],
+ 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
},
"reftest-no-accel": {
"options": ["--suite=reftest",
"--setpref=gfx.direct2d.disabled=true",
"--setpref=layers.acceleration.disabled=true"],
"tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
},
- "crashtest-ipc": {
- "options": ["--suite=crashtest",
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- "tests": ['tests/reftest/tests/testing/crashtest/crashtests.list'],
- },
},
"all_xpcshell_suites": {
"xpcshell": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': []
},
"xpcshell-addons": {
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -179,50 +179,34 @@ config = {
"mochitest-metro-chrome": ["--flavor=browser", "--metro-immersive"],
"jetpack-package": ["--flavor=jetpack-package"],
"jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"],
"jetpack-addon": ["--flavor=jetpack-addon"],
"a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {
- "reftest": {
- 'options': ["--suite=reftest"],
- 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
- },
"crashtest": {
'options': ["--suite=crashtest"],
'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
},
"jsreftest": {
'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
'tests': ["tests/jsreftest/tests/jstests.list"]
},
- "reftest-ipc": {
- 'options': ['--suite=reftest',
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- 'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
+ "reftest": {
+ 'options': ["--suite=reftest"],
+ 'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
},
"reftest-no-accel": {
"options": ["--suite=reftest",
"--setpref=gfx.direct2d.disabled=true",
"--setpref=layers.acceleration.disabled=true"],
"tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
},
- "crashtest-ipc": {
- "options": ["--suite=crashtest",
- '--setpref=browser.tabs.remote=true',
- '--setpref=browser.tabs.remote.autostart=true',
- '--setpref=extensions.e10sBlocksEnabling=false',
- '--setpref=layers.async-pan-zoom.enabled=true'],
- "tests": ['tests/reftest/tests/testing/crashtest/crashtests.list'],
- },
},
"all_xpcshell_suites": {
"xpcshell": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': []
},
"xpcshell-addons": {
--- a/testing/mozharness/mach_commands.py
+++ b/testing/mozharness/mach_commands.py
@@ -73,46 +73,36 @@ class MozharnessRunner(MozbuildObject):
"config": desktop_unittest_config + [
"--mochitest-suite", "browser-chrome"]
},
"mochitest-devtools-chrome": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
"--mochitest-suite", "mochitest-devtools-chrome"]
},
- "reftest": {
- "script": "desktop_unittest.py",
- "config": desktop_unittest_config + [
- "--reftest-suite", "reftest"]
- },
"crashtest": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
"--reftest-suite", "crashtest"]
},
"jsreftest": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
"--reftest-suite", "jsreftest"]
},
- "reftest-ipc": {
+ "reftest": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
- "--reftest-suite", "reftest-ipc"]
+ "--reftest-suite", "reftest"]
},
"reftest-no-accel": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
"--reftest-suite", "reftest-no-accel"]
},
- "crashtest-ipc": {
- "script": "desktop_unittest.py",
- "config": desktop_unittest_config + [
- "--reftest-suite", "crashtest-ipc"]
- },
"cppunittest": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
"--cppunittest-suite", "cppunittest"]
},
"xpcshell": {
"script": "desktop_unittest.py",
"config": desktop_unittest_config + [
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -108,41 +108,21 @@ reftest-b2g:
if [ '${REFTEST_PATH}' != '' ]; then \
$(call RUN_REFTEST_B2G,tests/${REFTEST_PATH}); \
else \
$(call RUN_REFTEST_B2G,tests/$(TEST_PATH)); \
fi; \
$(CHECK_TEST_ERROR); \
fi
-reftest-ipc: TEST_PATH?=layout/reftests/reftest.list
-reftest-ipc:
- $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT))
- $(CHECK_TEST_ERROR)
-
-reftest-ipc-gpu: TEST_PATH?=layout/reftests/reftest.list
-reftest-ipc-gpu:
- $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT) $(GPU_RENDERING))
- $(CHECK_TEST_ERROR)
-
crashtest: TEST_PATH?=testing/crashtest/crashtests.list
crashtest:
$(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)')
$(CHECK_TEST_ERROR)
-crashtest-ipc: TEST_PATH?=testing/crashtest/crashtests.list
-crashtest-ipc:
- $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT))
- $(CHECK_TEST_ERROR)
-
-crashtest-ipc-gpu: TEST_PATH?=testing/crashtest/crashtests.list
-crashtest-ipc-gpu:
- $(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT) $(GPU_RENDERING))
- $(CHECK_TEST_ERROR)
-
jstestbrowser: TESTS_PATH?=test-stage/jsreftest/tests/
jstestbrowser:
$(MAKE) -C $(DEPTH)/config
$(MAKE) stage-jstests
$(call RUN_REFTEST,'$(DIST)/$(TESTS_PATH)/jstests.list' --extra-profile-file=$(DIST)/test-stage/jsreftest/tests/user.js)
$(CHECK_TEST_ERROR)
GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)