Bug 1446954: Remove support for running tests on automation without stylo configurations. r=froydnj

You can still run them on a --disable-stylo build, as long as that works
(presumably not for long).

I think I haven't missed anything, but please double-check.

MozReview-Commit-ID: 3BIAEjgTLo5

layout/tools/reftest/globals.jsm

@@ -70,7 +70,6 @@ for (let [key, val] of Object.entries({
     contentGfxInfo: null,
     focusFilterMode: "all",
     compareRetainedDisplayLists: false,
-    compareStyloToGecko: false,
 
     browser: undefined,
     // Are we testing web content loaded in a separate process?

layout/tools/reftest/reftest.jsm

@@ -265,11 +265,6 @@ function InitAndStartRefTests()
     try {
         g.compareRetainedDisplayLists = prefs.getBoolPref("reftest.compareRetainedDisplayLists");
     } catch (e) {}
-#ifdef MOZ_STYLO
-    try {
-        g.compareStyloToGecko = prefs.getBoolPref("reftest.compareStyloToGecko");
-    } catch(e) {}
-#endif
 
 #ifdef MOZ_ENABLE_SKIA_PDF
     try {

taskcluster/ci/test/reftest.yml

@@ -170,10 +170,3 @@ reftest-no-accel:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
-
-reftest-stylo:
-    description: "Reftest run in Stylo vs. Gecko mode"
-    suite: reftest/reftest-stylo
-    treeherder-symbol: R(Rs)
-    virtualization: virtual-with-gpu
-    chunks: 8

taskcluster/ci/test/test-platforms.yml

@@ -40,7 +40,6 @@ linux64/debug:
     test-sets:
         - common-tests
         - web-platform-tests
-        - reftest-stylo
         - mochitest-headless
 linux64/opt:
     build-platform: linux64/opt
@@ -48,7 +47,6 @@ linux64/opt:
         - common-tests
         - web-platform-tests
         - opt-only-tests
-        - reftest-stylo
         - desktop-screenshot-capture
         - talos
         - awsy
@@ -84,26 +82,6 @@ linux64-asan/opt:
     test-sets:
         - common-tests
 
-# Stylo disabled mode only runs a subset of tests.
-linux32-stylo-disabled/debug:
-    build-platform: linux/debug
-    test-sets:
-        - stylo-disabled-tests
-linux32-stylo-disabled/opt:
-    build-platform: linux/opt
-    test-sets:
-        - stylo-disabled-tests
-linux64-stylo-disabled/debug:
-    build-platform: linux64/debug
-    test-sets:
-        - stylo-disabled-tests
-        - devtools-tests
-linux64-stylo-disabled/opt:
-    build-platform: linux64/opt
-    test-sets:
-        - stylo-disabled-tests
-        - devtools-tests
-
 # Stylo sequential runs check memory and performance when using a single thread.
 linux64-stylo-sequential/opt:
     build-platform: linux64/opt

taskcluster/ci/test/test-sets.yml

@@ -83,25 +83,6 @@ awsy-stylo-sequential:
 ##
 # Limited test sets for specific platforms
 
-stylo-disabled-tests:
-    - cppunit
-    - crashtest
-    - reftest
-    - web-platform-tests
-    - web-platform-tests-reftests
-    - mochitest
-    - mochitest-a11y
-    - mochitest-browser-chrome
-    - browser-screenshots
-    - mochitest-chrome
-    - mochitest-clipboard
-    - mochitest-gpu
-    - mochitest-media
-    - mochitest-webgl
-
-reftest-stylo:
-    - reftest-stylo
-
 linux-qr-talos:
     - talos-chrome
     - talos-dromaeojs

taskcluster/taskgraph/test/test_try_option_syntax.py

@@ -231,13 +231,13 @@ class TestTryOptionSyntax(unittest.TestCase):
         ]))
 
     def test_u_platforms_pretty(self):
-        """-u gtest[Ubuntu] selects the linux, linux64, linux64-asan, linux64-stylo-disabled,
+        """-u gtest[Ubuntu] selects the linux, linux64, linux64-asan
         and linux64-stylo-sequential platforms for gtest"""
         parameters = {'try_options': parse_message('try: -u gtest[Ubuntu]')}
         tos = TryOptionSyntax(parameters, graph_with_jobs, GRAPH_CONFIG)
         self.assertEqual(sorted(tos.unittests), sorted([
             {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan',
-                                            'linux64-stylo-disabled', 'linux64-stylo-sequential']},
+                                            'linux64-stylo-sequential']},
         ]))
 
     def test_u_platforms_negated(self):

taskcluster/taskgraph/transforms/tests.py

@@ -69,11 +69,6 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
-    'windows7-32-stylo-disabled': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win7-32-hw',
-    },
     'windows10-64': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
@@ -99,11 +94,6 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
-    'windows10-64-stylo-disabled': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
-    },
     'windows10-64-asan': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
@@ -551,18 +541,8 @@ def set_treeherder_machine_platform(config, tests):
         'android-api-16-gradle/opt': 'android-api-16-gradle/opt',
     }
     for test in tests:
-        # For most desktop platforms, the above table is not used for "regular"
+        test['treeherder-machine-platform'] = translation.get(
-        # builds, so we'll always pick the test platform here.
+            test['build-platform'], test['test-platform'])
-        # On macOS though, the regular builds are in the table.  This causes a
-        # conflict in `verify_task_graph_symbol` once you add a new test
-        # platform based on regular macOS builds, such as for Stylo.
-        # Since it's unclear if the regular macOS builds can be removed from
-        # the table, workaround the issue for Stylo.
-        if '-stylo-disabled' in test['test-platform']:
-            test['treeherder-machine-platform'] = test['test-platform']
-        else:
-            test['treeherder-machine-platform'] = translation.get(
-                test['build-platform'], test['test-platform'])
         yield test
 
 
@@ -580,36 +560,26 @@ def set_tier(config, tests):
                                          'linux32/debug',
                                          'linux32-nightly/opt',
                                          'linux32-devedition/opt',
-                                         'linux32-stylo-disabled/debug',
-                                         'linux32-stylo-disabled/opt',
                                          'linux64/opt',
                                          'linux64-nightly/opt',
                                          'linux64/debug',
                                          'linux64-pgo/opt',
                                          'linux64-devedition/opt',
                                          'linux64-asan/opt',
-                                         'linux64-stylo-disabled/debug',
-                                         'linux64-stylo-disabled/opt',
                                          'windows7-32/debug',
                                          'windows7-32/opt',
                                          'windows7-32-pgo/opt',
                                          'windows7-32-devedition/opt',
                                          'windows7-32-nightly/opt',
-                                         'windows7-32-stylo-disabled/debug',
-                                         'windows7-32-stylo-disabled/opt',
                                          'windows10-64/debug',
                                          'windows10-64/opt',
                                          'windows10-64-pgo/opt',
                                          'windows10-64-devedition/opt',
                                          'windows10-64-nightly/opt',
-                                         'windows10-64-stylo-disabled/debug',
-                                         'windows10-64-stylo-disabled/opt',
                                          'macosx64/opt',
                                          'macosx64/debug',
                                          'macosx64-nightly/opt',
                                          'macosx64-devedition/opt',
-                                         'macosx64-stylo-disabled/debug',
-                                         'macosx64-stylo-disabled/opt',
                                          'android-4.3-arm7-api-16/opt',
                                          'android-4.3-arm7-api-16/debug',
                                          'android-4.2-x86/opt']:
@@ -889,21 +859,6 @@ def set_test_type(config, tests):
         yield test
 
 
-@transforms.add
-def disable_stylo(config, tests):
-    """
-    Disable Stylo for all jobs on `-stylo-disabled` platforms.
-    """
-    for test in tests:
-        if '-stylo-disabled' not in test['test-platform']:
-            yield test
-            continue
-
-        test['mozharness'].setdefault('extra-options', []).append('--disable-stylo')
-
-        yield test
-
-
 @transforms.add
 def single_stylo_traversal_tests(config, tests):
     """Enable single traversal for all tests on the sequential Stylo platform."""

taskcluster/taskgraph/try_option_syntax.py

@@ -98,7 +98,6 @@ UNITTEST_ALIASES = {
     'reftest-no-accel': alias_matches(r'^(plain-)?reftest-no-accel.*$'),
     'reftests': alias_matches(r'^(plain-)?reftest.*$'),
     'reftests-e10s': alias_matches(r'^(plain-)?reftest-e10s.*$'),
-    'reftest-stylo': alias_matches(r'^(plain-)?reftest-stylo.*$'),
     'reftest-gpu': alias_matches(r'^(plain-)?reftest-gpu.*$'),
     'robocop': alias_prefix('robocop'),
     'web-platform-test': alias_prefix('web-platform-tests'),
@@ -126,13 +125,11 @@ UNITTEST_PLATFORM_PRETTY_NAMES = {
         'linux32',
         'linux64',
         'linux64-asan',
-        'linux64-stylo-disabled',
         'linux64-stylo-sequential'
     ],
     'x64': [
         'linux64',
         'linux64-asan',
-        'linux64-stylo-disabled',
         'linux64-stylo-sequential'
     ],
     'Android 4.3': ['android-4.3-arm7-api-16'],

testing/awsy/awsy/process_perf_data.py

@@ -69,8 +69,6 @@ def create_suite(name, node, data_path):
     }
     if 'STYLO_FORCE_ENABLED' in os.environ and os.environ['STYLO_FORCE_ENABLED']:
         suite['extraOptions'] = ["stylo"]
-    if 'STYLO_FORCE_DISABLED' in os.environ and os.environ['STYLO_FORCE_DISABLED']:
-        suite['extraOptions'] = ["stylo-disabled"]
     if 'STYLO_THREADS' in os.environ and os.environ['STYLO_THREADS'] == '1':
         suite['extraOptions'] = ["stylo-sequential"]
     update_checkpoint_paths(glob.glob(os.path.join(data_path, "memory-report*")))

testing/awsy/mach_commands.py

@@ -64,14 +64,6 @@ class MachCommands(MachCommandBase):
             kwargs['perTabPause'] = 1
             kwargs['settleWaitTime'] = 1
 
-        if 'disable_stylo' in kwargs and kwargs['disable_stylo']:
-            if 'single_stylo_traversal' in kwargs and kwargs['single_stylo_traversal']:
-                print("--disable-stylo conflicts with --single-stylo-traversal")
-                return 1
-            if 'enable_stylo' in kwargs and kwargs['enable_stylo']:
-                print("--disable-stylo conflicts with --enable-stylo")
-                return 1
-
         if 'single_stylo_traversal' in kwargs and kwargs['single_stylo_traversal']:
             os.environ['STYLO_THREADS'] = '1'
         else:
@@ -79,8 +71,6 @@ class MachCommands(MachCommandBase):
 
         if 'enable_stylo' in kwargs and kwargs['enable_stylo']:
             os.environ['STYLO_FORCE_ENABLED'] = '1'
-        if 'disable_stylo' in kwargs and kwargs['disable_stylo']:
-            os.environ['STYLO_FORCE_DISABLED'] = '1'
 
         if 'enable_webrender' in kwargs and kwargs['enable_webrender']:
             os.environ['MOZ_WEBRENDER'] = '1'
@@ -218,9 +208,6 @@ class MachCommands(MachCommandBase):
     @CommandArgument('--enable-stylo', group='AWSY', action='store_true',
                      dest='enable_stylo', default=False,
                      help='Enable Stylo.')
-    @CommandArgument('--disable-stylo', group='AWSY', action='store_true',
-                     dest='disable_stylo', default=False,
-                     help='Disable Stylo.')
     @CommandArgument('--single-stylo-traversal', group='AWSY', action='store_true',
                      dest='single_stylo_traversal', default=False,
                      help='Set STYLO_THREADS=1.')

testing/mochitest/runtests.py

@@ -1427,8 +1427,6 @@ toolbar#nav-bar {
                 mozinfo.update(options.extra_mozinfo_json)
             if 'STYLO_FORCE_ENABLED' in os.environ:
                 mozinfo.update({'stylo': True})
-            if 'STYLO_FORCE_DISABLED' in os.environ:
-                mozinfo.update({'stylo': False})
 
             info = mozinfo.info
 

testing/mozharness/configs/unittests/linux_unittest.py

@@ -215,11 +215,6 @@ config = {
                         "--setpref=layers.acceleration.disabled=true"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
-        "reftest-stylo": {
-            "options": ["--suite=reftest",
-                        "--setpref=reftest.compareStyloToGecko=true"],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
     },
     "all_xpcshell_suites": {
         "xpcshell": {

testing/mozharness/configs/unittests/mac_unittest.py

@@ -171,11 +171,6 @@ config = {
             'options': ["--suite=reftest"],
             'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
-        "reftest-stylo": {
-            "options": ["--suite=reftest",
-                        "--setpref=reftest.compareStyloToGecko=true"],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
     },
     "all_xpcshell_suites": {
         "xpcshell": {

testing/mozharness/configs/unittests/win_taskcluster_unittest.py

@@ -204,11 +204,6 @@ config = {
                         "--setpref=layers.acceleration.disabled=true"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
-        "reftest-stylo": {
-            "options": ["--suite=reftest",
-                        "--setpref=reftest.compareStyloToGecko=true"],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
     },
     "all_xpcshell_suites": {
         "xpcshell": {

testing/mozharness/mozharness/mozilla/testing/talos.py

@@ -692,10 +692,6 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin, TooltoolMixin,
             if 'qr' in platform:
                 env['MOZ_WEBRENDER'] = '1'
                 env['MOZ_ACCELERATED'] = '1'
-            if 'stylo' in platform and 'stylo_disabled' not in platform:
-                env['STYLO_FORCE_ENABLED'] = '1'
-            if 'stylo_disabled' in platform:
-                env['STYLO_FORCE_DISABLED'] = '1'
             if 'styloseq' in platform:
                 env['STYLO_THREADS'] = '1'
 

testing/mozharness/scripts/desktop_unittest.py

@@ -169,12 +169,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
             "default": False,
             "help": "Run tests with Stylo enabled"}
          ],
-        [["--disable-stylo"], {
-            "action": "store_true",
-            "dest": "disable_stylo",
-            "default": False,
-            "help": "Run tests with Stylo disabled"}
-         ],
         [["--enable-webrender"], {
             "action": "store_true",
             "dest": "enable_webrender",
@@ -243,8 +237,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
 
         if c['enable_stylo']:
             perfherder_options.append('stylo')
-        if c['disable_stylo']:
-            perfherder_options.append('stylo_disabled')
 
         self.resource_monitor_perfherder_id = ('.'.join(perfherder_parts),
                                                perfherder_options)
@@ -858,12 +850,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
                     env['MOZ_WEBRENDER'] = '1'
                     env['MOZ_ACCELERATED'] = '1'
 
-                if self.config['disable_stylo']:
-                    if self.config['single_stylo_traversal']:
-                        self.fatal("--disable-stylo conflicts with --single-stylo-traversal")
-                    if self.config['enable_stylo']:
-                        self.fatal("--disable-stylo conflicts with --enable-stylo")
-
                 if self.config['single_stylo_traversal']:
                     env['STYLO_THREADS'] = '1'
                 else:
@@ -871,8 +857,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
 
                 if self.config['enable_stylo']:
                     env['STYLO_FORCE_ENABLED'] = '1'
-                if self.config['disable_stylo']:
-                    env['STYLO_FORCE_DISABLED'] = '1'
 
                 env = self.query_env(partial_env=env, log_level=INFO)
                 cmd_timeout = self.get_timeout_for_category(suite_category)

testing/mozharness/scripts/web_platform_tests.py

@@ -335,8 +335,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, BlobUploadMixin, CodeCovera
 
         if self.config['enable_stylo']:
             env['STYLO_FORCE_ENABLED'] = '1'
-        if self.config['disable_stylo']:
-            env['STYLO_FORCE_DISABLED'] = '1'
 
         env = self.query_env(partial_env=env, log_level=INFO)
 

tools/tryselect/docs/selectors/fuzzy.rst

@@ -106,14 +106,10 @@ Would produce the following ``try_task_config.json``:
       "tasks":[
         "test-linux64-qr/debug-reftest-e10s-1",
         "test-linux64-qr/opt-reftest-e10s-1",
-        "test-linux64-stylo-disabled/debug-reftest-e10s-1",
-        "test-linux64-stylo-disabled/opt-reftest-e10s-1",
         "test-linux64/debug-reftest-e10s-1",
         "test-linux64/debug-reftest-no-accel-e10s-1",
-        "test-linux64/debug-reftest-stylo-e10s-1",
         "test-linux64/opt-reftest-e10s-1",
         "test-linux64/opt-reftest-no-accel-e10s-1",
-        "test-linux64/opt-reftest-stylo-e10s-1"
       ]
     }