Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1541527 - Remove "-e10s" from treeherder group symbols and task labels, r=jmaher,gbrown

Browse Source 
Since e10s is the default configuration, we shouldn't explicitly mark things
with the "-e10s" suffix. Instead we should mark things that *don't* run with
'e10s. This patch removes '-e10s' from all treeherder group symbols and task
labels, adds the "-1proc" suffix to tasks that are non-e10s.

Differential Revision: https://phabricator.services.mozilla.com/D25958

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew Halberstadt 2019-04-15 18:18:33 +00:00
parent 271ba020e3
commit 6b482c7f2e
15 changed files with 106 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
taskcluster/ci/config.yml
View File

@ -13,50 +13,50 @@ treeherder:
'Bpgo': 'Profile-guided optimization builds'
'Fetch-URL': 'Fetch and store content'
'Fxfn-l': 'Firefox functional tests (local)'
'Fxfn-l-e10s': 'Firefox functional tests (local) with e10s'
'Fxfn-l-1proc': 'Firefox functional tests (local) without e10s'
'Fxfn-r': 'Firefox functional tests (remote)'
'Fxfn-r-e10s': 'Firefox functional tests (remote) with e10s'
'Fxfn-r-1proc': 'Firefox functional tests (remote) without e10s'
'M': 'Mochitests'
'M-sw': 'Mochitests with serviceworker redesign'
'M-1proc': 'Mochitests without e10s'
'M-spi': 'Mochitests with socket process'
'M-e10s': 'Mochitests with e10s'
'M-e10s-spi': 'Mochitests with socket process and e10s'
'M-sw-e10s': 'Mochitests with serviceworker redesign and e10s'
'M-V': 'Mochitests on Valgrind'
'M-spi-1proc': 'Mochitests with socket process without e10s'
'M-sw': 'Mochitests with serviceworker redesign'
'M-sw-1proc': 'Mochitests with serviceworker redesign without e10s'
'M-V-1proc': 'Mochitests on Valgrind without e10s'
'MSI': 'Repack installers into MSIs'
'MSIs': 'Signing of Repacked installers of MSIs'
'R': 'Reftests'
'R-sw': 'Reftests with serviceworker redesign enabled'
'R-e10s': 'Reftests with e10s'
'R-sw-e10s': 'Reftests with serviceworker redesign and e10s'
'R-1proc': 'Reftests without e10s'
'R-sw': 'Reftests with serviceworker redesign'
'R-sw-1proc': 'Reftests with serviceworker redesign enabled without e10s'
'Rap': 'Raptor performance tests on Firefox'
'Rap-e10s': 'Raptor performance tests on Firefox with e10s'
'Rap-refbrow-e10s': 'Raptor performance tests on the reference browser'
'Rap-1proc': 'Raptor performance tests on Firefox without e10s'
'Rap-Prof': 'Raptor performance tests on Firefox with Gecko Profiling'
'Rap-Prof-e10s': 'Raptor performance tests on Firefox with Gecko Profiling'
'Rap-ChC-e10s': 'Raptor performance tests on Google Chrome Canary'
'Rap-ChD-e10s': 'Raptor performance tests on Google Chrome Dev'
'Rap-Cr-e10s': 'Raptor performance tests on Google Chromium'
'Rap-Prof-1proc': 'Raptor performance tests on Firefox with Gecko Profiling and without e10s'
'Rap-ChC': 'Raptor performance tests on Google Chrome Canary'
'Rap-ChD': 'Raptor performance tests on Google Chrome Dev'
'Rap-Cr': 'Raptor performance tests on Google Chromium'
'Rap-P': 'Raptor power tests on Firefox'
'Rap-P-e10s': 'Raptor power tests on Firefox with e10s'
'Rap-P-1proc': 'Raptor power tests on Firefox without e10s'
'Rap-refbrow': 'Raptor performance tests on the reference browser'
'T': 'Talos performance tests'
'Tsd': 'Talos performance tests with Stylo disabled'
'Tss': 'Talos performance tests with Stylo sequential'
'T-e10s': 'Talos performance tests with e10s'
'Tsd-e10s': 'Talos performance tests with e10s, Stylo disabled'
'Tss-e10s': 'Talos performance tests with e10s, Stylo sequential'
'T-1proc': 'Talos performance tests without e10s'
'Tsd': 'Talos performance tests with e10s, Stylo disabled'
'Tsd-1proc': 'Talos performance tests with Stylo disabled without e10s'
'Tss': 'Talos performance tests with e10s, Stylo sequential'
'Tss-1proc': 'Talos performance tests with Stylo sequential without e10s'
'tt': 'Telemetry tests'
'tt-e10s': 'Telemetry tests with e10s'
'SY-e10s': 'Are we slim yet tests by TaskCluster with e10s'
'SYsd-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo disabled'
'SYss-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo sequential'
'tt-1proc': 'Telemetry tests without e10s'
'SY': 'Are we slim yet tests by TaskCluster'
'SYsd': 'Are we slim yet tests by TaskCluster, Stylo disabled'
'SYss': 'Are we slim yet tests by TaskCluster, Stylo sequential'
'VP': 'VideoPuppeteer tests'
'W': 'Web platform tests'
'W-1proc': 'Web platform tests without e10s'
'W-sw': 'Web platform tests with serviceworker redesign'
'W-e10s': 'Web platform tests with e10s'
'W-sw-e10s': 'Web platform tests with serviceworker redesign and e10s'
'X': 'Xpcshell tests'
'X-sw': 'Xpcshell tests with serviceworker redesign'
'W-sw-1proc': 'Web platform tests with serviceworker redesign, without e10s'
'X-1proc': 'Xpcshell tests, without e10s'
'X-sw-1proc': 'Xpcshell tests with serviceworker redesign, without e10s'
'L10n': 'Localised Repacks'
'L10n-Rpk': 'Localized Repackaged Repacks'
'BM': 'Beetmover'

25
taskcluster/taskgraph/transforms/tests.py
View File

@ -977,27 +977,22 @@ def split_e10s(config, tests):
for test in tests:
e10s = test['e10s']
test['e10s'] = False
test['attributes']['e10s'] = False
test['e10s'] = True
test['attributes']['e10s'] = True
if e10s == 'both':
yield copy.deepcopy(test)
e10s = True
if e10s:
test['test-name'] += '-e10s'
test['try-name'] += '-e10s'
test['e10s'] = True
test['attributes']['e10s'] = True
e10s = False
if not e10s:
test['test-name'] += '-1proc'
test['try-name'] += '-1proc'
test['e10s'] = False
test['attributes']['e10s'] = False
group, symbol = split_symbol(test['treeherder-symbol'])
if group != '?':
group += '-e10s'
group += '-1proc'
test['treeherder-symbol'] = join_symbol(group, symbol)
if test['suite'] == 'talos' or test['suite'] == 'raptor':
for i, option in enumerate(test['mozharness']['extra-options']):
if option.startswith('--suite='):
test['mozharness']['extra-options'][i] += '-e10s'
else:
test['mozharness']['extra-options'].append('--e10s')
test['mozharness']['extra-options'].append('--disable-e10s')
yield test

8
testing/mozbase/moztest/moztest/resolve.py
View File

@ -198,28 +198,28 @@ TEST_SUITES = {
'mach_command': 'web-platform-tests',
'kwargs': {'include': []},
'task_regex': ['web-platform-tests($|.*(-1|[^0-9])$)',
'test-verify-wpt-e10s'],
'test-verify-wpt'],
},
'web-platform-tests-testharness': {
'aliases': ('wpt',),
'mach_command': 'web-platform-tests',
'kwargs': {'include': []},
'task_regex': ['web-platform-tests(?!-reftest|-wdspec)($|.*(-1|[^0-9])$)',
'test-verify-wpt-e10s'],
'test-verify-wpt'],
},
'web-platform-tests-reftest': {
'aliases': ('wpt',),
'mach_command': 'web-platform-tests',
'kwargs': {'include': []},
'task_regex': ['web-platform-tests-reftests($|.*(-1|[^0-9])$)',
'test-verify-wpt-e10s'],
'test-verify-wpt'],
},
'web-platform-tests-wdspec': {
'aliases': ('wpt',),
'mach_command': 'web-platform-tests',
'kwargs': {'include': []},
'task_regex': ['web-platform-tests-wdspec($|.*(-1|[^0-9])$)',
'test-verify-wpt-e10s'],
'test-verify-wpt'],
},
'valgrind': {
'aliases': ('v',),

9
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
View File

@ -43,11 +43,11 @@ firefox_ui_tests_config_options = [
'default': False,
'help': 'Only show what was going to be tested.',
}],
[["--e10s"], {
[["--disable-e10s"], {
'dest': 'e10s',
'action': 'store_true',
'default': False,
'help': 'Enable multi-process (e10s) mode when running tests.',
'action': 'store_false',
'default': True,
'help': 'Disable multi-process (e10s) mode when running tests.',
}],
[['--symbols-path=SYMBOLS_PATH'], {
'dest': 'symbols_path',
@ -237,7 +237,6 @@ class FirefoxUITests(TestingMixin, VCSToolsScript, CodeCoverageMixin):
# Collect all pass-through harness options to the script
cmd.extend(self.query_harness_args())
# Translate deprecated --e10s flag
if not self.config.get('e10s'):
cmd.append('--disable-e10s')

11
testing/mozharness/mozharness/mozilla/testing/talos.py
View File

@ -151,12 +151,11 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin,
"default": 0,
"help": "The interval between samples taken by the profiler (milliseconds)"
}],
[["--e10s"], {
[["--disable-e10s"], {
"dest": "e10s",
"action": "store_true",
"default": False,
"help": "we should have --disable-e10s, but instead we assume non-e10s and use "
"--e10s to help"
"action": "store_false",
"default": True,
"help": "Run without multiple processes (e10s)."
}],
[["--enable-webrender"], {
"action": "store_true",
@ -335,8 +334,6 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin,
kw_options = {'executablePath': binary_path}
if 'suite' in self.config:
kw_options['suite'] = self.config['suite']
if self.config.get('e10s', False):
kw_options['suite'] = "%s-e10s" % self.config['suite']
if self.config.get('title'):
kw_options['title'] = self.config['title']
if self.symbols_path:

8
testing/mozharness/scripts/android_emulator_unittest.py
View File

@ -81,11 +81,11 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
"help": "Set log level (debug|info|warning|error|critical|fatal)",
}
], [
['--e10s', ],
{"action": "store_true",
['--disable-e10s', ],
{"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run tests with multiple processes.",
"default": True,
"help": "Run tests without multiple processes (e10s).",
}
], [
['--enable-webrender'],

8
testing/mozharness/scripts/android_hardware_unittest.py
View File

@ -72,11 +72,11 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin,
"help": "Set log level (debug|info|warning|error|critical|fatal)",
}
], [
['--e10s', ],
{"action": "store_true",
['--disable-e10s', ],
{"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run tests with multiple processes.",
"default": True,
"help": "Run tests without multiple processes (e10s).",
}
]] + copy.deepcopy(testing_config_options)

8
testing/mozharness/scripts/awsy_script.py
View File

@ -38,11 +38,11 @@ external_tools_path = os.path.join(scripts_path, 'external_tools')
class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
config_options = [
[["--e10s"],
{"action": "store_true",
[["--disable-e10s"],
{"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run tests with multiple processes. (Desktop builds only)",
"default": True,
"help": "Run tests without multiple processes (e10s). (Desktop builds only)",
}],
[["--single-stylo-traversal"],
{"action": "store_true",

8
testing/mozharness/scripts/desktop_unittest.py
View File

@ -115,11 +115,11 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
"in the config file. You do not need to specify "
"any other suites.\nBeware, this may take a while ;)"}
],
[['--e10s', ], {
"action": "store_true",
[['--disable-e10s', ], {
"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run tests with multiple processes."}
"default": True,
"help": "Run tests without multiple processes (e10s)."}
],
[['--headless', ], {
"action": "store_true",

8
testing/mozharness/scripts/marionette.py
View File

@ -84,11 +84,11 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin,
"help": "Number of this chunk",
}
], [
["--e10s"],
{"action": "store_true",
["--disable-e10s"],
{"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run tests with multiple processes. (Desktop builds only)",
"default": True,
"help": "Run tests without multiple processes (e10s). (Desktop builds only)",
}
], [
["--headless"],

8
testing/mozharness/scripts/telemetry/telemetry_client.py
View File

@ -45,11 +45,11 @@ telemetry_tests_config_options = [
'default': False,
'help': 'Only show what was going to be tested.',
}],
[["--e10s"], {
[["--disable-e10s"], {
'dest': 'e10s',
'action': 'store_true',
'default': False,
'help': 'Enable multi-process (e10s) mode when running tests.',
'action': 'store_false',
'default': True,
'help': 'Disable multi-process (e10s) mode when running tests.',
}],
[['--symbols-path=SYMBOLS_PATH'], {
'dest': 'symbols_path',

8
testing/mozharness/scripts/web_platform_tests.py
View File

@ -39,11 +39,11 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
"dest": "test_type",
"help": "Specify the test types to run."}
],
[['--e10s'], {
"action": "store_true",
[['--disable-e10s'], {
"action": "store_false",
"dest": "e10s",
"default": False,
"help": "Run with e10s enabled"}
"default": True,
"help": "Run without e10s enabled"}
],
[["--total-chunks"], {
"action": "store",

46
testing/talos/talos.json
View File

@ -1,66 +1,66 @@
{
"suites": {
"bcv-e10s": {
"bcv": {
"tests": ["basic_compositor_video"]
},
"chromez-e10s": {
"chromez": {
"tests": ["about_preferences_basic", "tresize"]
},
"dromaeojs-e10s": {
"dromaeojs": {
"tests": ["dromaeo_css", "kraken"]
},
"flex-e10s": {
"flex": {
"tests": ["tart_flex", "ts_paint_flex"]
},
"other-e10s": {
"other": {
"tests": ["a11yr", "ts_paint", "tpaint", "twinopen", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint", "cpstartup", "startup_about_home_paint"]
},
"sessionrestore-many-windows-e10s": {
"sessionrestore-many-windows": {
"tests": ["sessionrestore_many_windows"]
},
"g1-e10s": {
"g1": {
"tests": ["tp5o_scroll", "glterrain"],
"pagesets_name": "tp5n.zip"
},
"damp-e10s": {
"damp": {
"tests": ["damp"],
"pagesets_name": "tp5n.zip"
},
"tabswitch-e10s": {
"tabswitch": {
"tests": ["tabswitch"],
"pagesets_name": "tp5n.zip"
},
"g3-e10s": {
"g3": {
"tests": ["dromaeo_dom"]
},
"g4-e10s": {
"g4": {
"tests": ["glvideo", "displaylist_mutate", "rasterflood_svg", "rasterflood_gradient"]
},
"g5-e10s": {
"g5": {
"tests": ["ts_paint_webext", "tp5o_webext"],
"pagesets_name": "tp5n.zip"
},
"motionmark-e10s": {
"motionmark": {
"tests": ["motionmark_animometer", "motionmark_htmlsuite", "JetStream", "ARES6"],
"benchmark_zip": "jetstream.zip"
},
"svgr-e10s": {
"svgr": {
"tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "tsvg_static"]
},
"perf-reftest-e10s": {
"perf-reftest": {
"tests": ["perf_reftest"]
},
"perf-reftest-singletons-e10s": {
"perf-reftest-singletons": {
"tests": ["perf_reftest_singletons"]
},
"speedometer-e10s": {
"speedometer": {
"tests": ["speedometer", "stylebench"]
},
"tp5o-e10s": {
"tp5o": {
"tests": ["tp5o"],
"pagesets_name": "tp5n.zip"
},
"xperf-e10s": {
"xperf": {
"tests": ["tp5n"],
"pagesets_name": "tp5n.zip",
"talos_options": [
@ -68,7 +68,7 @@
"\"c:/Program Files (x86)/Windows Kits/10/Windows Performance Toolkit/xperf.exe\""
]
},
"tp6-e10s": {
"tp6": {
"tests": ["tp6_youtube", "tp6_amazon", "tp6_facebook"],
"mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
"mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",
@ -79,7 +79,7 @@
"--firstNonBlankPaint"
]
},
"tp6-stylo-threads-e10s": {
"tp6-stylo-threads": {
"tests": ["tp6_youtube", "tp6_amazon", "tp6_facebook"],
"mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
"mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",
@ -91,10 +91,10 @@
"--firstNonBlankPaint"
]
},
"h1-e10s": {
"h1": {
"tests": ["ts_paint_heavy"]
},
"h2-e10s": {
"h2": {
"tests": ["tp6_google_heavy", "tp6_youtube_heavy", "tp6_amazon_heavy", "tp6_facebook_heavy"],
"mitmproxy_release_bin_osx": "mitmproxy-2.0.2-osx.tar.gz",
"mitmproxy_release_bin_linux64": "mitmproxy-2.0.2-linux.tar.gz",

2
tools/tryselect/test/test_fuzzy.py
View File

@ -23,7 +23,7 @@ def test_paths(run_mach, capfd):
# with the path filtering.
expected = """
"tasks": [
"test-linux64/opt-xpcshell-1"
"test-linux64/opt-xpcshell-1proc-1"
]""".lstrip()
assert expected in output

4
tools/tryselect/try_presets.yml
View File

@ -17,7 +17,7 @@ debugger-tests:
- "'debugger"
- "'mozlint-eslint"
- "!asan 'devtools !shippable | 'linux32 | 'macosx64"
- "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome | 'mochitest-clipboard-e10s"
- "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome | 'mochitest-clipboard"
- "!asan !shippable 'linux64/ 'xpcshell"
- "!qr !macosx !shippable 'damp"
@ -43,4 +43,4 @@ sample-suites:
- ^test- -1$
# Only run a single talos + raptor suite per platform
- ^test- !1$ !2$ !3$ !4$ !5$ !6$ !7$ !8$ !9$ !0$ !raptor !talos
- ^test- 'raptor-speedometer | 'talos-g1-e10s
- ^test- 'raptor-speedometer | 'talos-g1