Bug 1263230 - Remove in-tree references to IPC/OOP reftest modes. r=ahal

mozilla-spidermonkey · Nov 7, 2016 · f6d9465 · f6d9465
1 parent b3bd44c
commit f6d9465
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 182 deletions.
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
@@ -139,10 +139,6 @@ def run_b2g_test(self, b2g_home=None, xre_path=None, **kwargs):
         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):
@@ -170,10 +166,7 @@ def run_mulet_test(self, **kwargs):
 
         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):
@@ -221,8 +214,6 @@ def run_android_test(self, **kwargs):
         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
@@ -338,15 +329,6 @@ def run_jstestbrowser(self, **kwargs):
         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).',
@@ -355,15 +337,6 @@ 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)

diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
@@ -317,20 +317,6 @@ def __init__(self, **kwargs):
                           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"]
@@ -339,11 +325,6 @@ def _prefs_gpu(self):
     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")
@@ -502,12 +483,6 @@ def __init__(self, **kwargs):
                           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,

diff --git a/layout/tools/reftest/runreftestb2g.py b/layout/tools/reftest/runreftestb2g.py
@@ -261,10 +261,6 @@ def createReftestProfile(self, options, manifests):
         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)
 

diff --git a/testing/mach_commands.py b/testing/mach_commands.py
@@ -56,11 +56,6 @@
         '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',
@@ -112,11 +107,6 @@
         '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',

diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -206,10 +206,6 @@
     },
     # 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"]
@@ -219,34 +215,14 @@
                        "--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": {

diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -171,10 +171,6 @@
     },
     # 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"]
@@ -183,21 +179,9 @@
             '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": {

diff --git a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -184,10 +184,6 @@
     },
     # 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"]
@@ -196,28 +192,16 @@
             '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": {

diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
@@ -184,10 +184,6 @@
     },
     # 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"]
@@ -196,28 +192,16 @@
             '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": {

diff --git a/testing/mozharness/mach_commands.py b/testing/mozharness/mach_commands.py
@@ -78,11 +78,6 @@ def __init__(self, *args, **kwargs):
                 "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 + [
@@ -93,21 +88,16 @@ def __init__(self, *args, **kwargs):
                 "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 + [

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
@@ -113,31 +113,11 @@ reftest-b2g:
         $(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