Commit 6cf222b3 authored by tonyg's avatar tonyg Committed by Commit bot

[Telemetry] Do not run session_restore benchmarks on reference builds.

They were accidentally enabled with the switch to recipes and they don't work
because the older builds don't necessarily work with the generated profile.

BUG=388885
TBR=dtu@chromium.org

Review URL: https://codereview.chromium.org/596783005

Cr-Commit-Position: refs/heads/master@{#296342}
parent 93778c0c
...@@ -30,7 +30,8 @@ class _SessionRestoreTest(benchmark.Benchmark): ...@@ -30,7 +30,8 @@ class _SessionRestoreTest(benchmark.Benchmark):
args.browser_options.profile_dir = os.path.join(profile_dir, profile_type) args.browser_options.profile_dir = os.path.join(profile_dir, profile_type)
@benchmark.Disabled('android', 'linux') # crbug.com/325479, crbug.com/381990 # crbug.com/325479, crbug.com/381990
@benchmark.Disabled('android', 'linux', 'reference')
class SessionRestoreColdTypical25(_SessionRestoreTest): class SessionRestoreColdTypical25(_SessionRestoreTest):
tag = 'cold' tag = 'cold'
test = session_restore.SessionRestore test = session_restore.SessionRestore
...@@ -39,7 +40,8 @@ class SessionRestoreColdTypical25(_SessionRestoreTest): ...@@ -39,7 +40,8 @@ class SessionRestoreColdTypical25(_SessionRestoreTest):
'pageset_repeat': 5} 'pageset_repeat': 5}
@benchmark.Disabled('android', 'linux') # crbug.com/325479, crbug.com/381990 # crbug.com/325479, crbug.com/381990
@benchmark.Disabled('android', 'linux', 'reference')
class SessionRestoreWarmTypical25(_SessionRestoreTest): class SessionRestoreWarmTypical25(_SessionRestoreTest):
tag = 'warm' tag = 'warm'
test = session_restore.SessionRestore test = session_restore.SessionRestore
...@@ -49,7 +51,7 @@ class SessionRestoreWarmTypical25(_SessionRestoreTest): ...@@ -49,7 +51,7 @@ class SessionRestoreWarmTypical25(_SessionRestoreTest):
# crbug.com/325479, crbug.com/381990, crbug.com/405386 # crbug.com/325479, crbug.com/381990, crbug.com/405386
@benchmark.Disabled('android', 'linux', 'snowleopard') @benchmark.Disabled('android', 'linux', 'reference', 'snowleopard')
class SessionRestoreWithUrlCold(_SessionRestoreTest): class SessionRestoreWithUrlCold(_SessionRestoreTest):
"""Measure Chrome cold session restore with startup URLs.""" """Measure Chrome cold session restore with startup URLs."""
tag = 'cold' tag = 'cold'
...@@ -60,7 +62,7 @@ class SessionRestoreWithUrlCold(_SessionRestoreTest): ...@@ -60,7 +62,7 @@ class SessionRestoreWithUrlCold(_SessionRestoreTest):
# crbug.com/325479, crbug.com/381990, crbug.com/405386 # crbug.com/325479, crbug.com/381990, crbug.com/405386
@benchmark.Disabled('android', 'linux', 'snowleopard') @benchmark.Disabled('android', 'linux', 'reference', 'snowleopard')
class SessionRestoreWithUrlWarm(_SessionRestoreTest): class SessionRestoreWithUrlWarm(_SessionRestoreTest):
"""Measure Chrome warm session restore with startup URLs.""" """Measure Chrome warm session restore with startup URLs."""
tag = 'warm' tag = 'warm'
......
...@@ -89,10 +89,11 @@ class List(command_line.OptparseCommand): ...@@ -89,10 +89,11 @@ class List(command_line.OptparseCommand):
def Run(self, args): def Run(self, args):
if args.json_output_file: if args.json_output_file:
possible_browser = browser_finder.FindBrowser(args) possible_browser = browser_finder.FindBrowser(args)
has_ref = 'reference' in browser_finder.GetAllAvailableBrowserTypes(args) args.browser_type = 'reference'
possible_reference_browser = browser_finder.FindBrowser(args)
with open(args.json_output_file, 'w') as f: with open(args.json_output_file, 'w') as f:
f.write(_GetJsonTestList(possible_browser, has_ref, args.tests, f.write(_GetJsonTestList(possible_browser, possible_reference_browser,
args.num_shards)) args.tests, args.num_shards))
else: else:
_PrintTestList(args.tests) _PrintTestList(args.tests)
return 0 return 0
...@@ -255,7 +256,8 @@ def _MatchTestName(input_test_name, exact_matches=True): ...@@ -255,7 +256,8 @@ def _MatchTestName(input_test_name, exact_matches=True):
if _Matches(input_test_name, test_class.Name())] if _Matches(input_test_name, test_class.Name())]
def _GetJsonTestList(possible_browser, has_reference, test_classes, num_shards): def _GetJsonTestList(possible_browser, possible_reference_browser,
test_classes, num_shards):
"""Returns a list of all enabled tests in a JSON format expected by buildbots. """Returns a list of all enabled tests in a JSON format expected by buildbots.
JSON format (see build/android/pylib/perf/test_runner.py): JSON format (see build/android/pylib/perf/test_runner.py):
...@@ -298,7 +300,8 @@ def _GetJsonTestList(possible_browser, has_reference, test_classes, num_shards): ...@@ -298,7 +300,8 @@ def _GetJsonTestList(possible_browser, has_reference, test_classes, num_shards):
'device_affinity': device_affinity, 'device_affinity': device_affinity,
'perf_dashboard_id': perf_dashboard_id, 'perf_dashboard_id': perf_dashboard_id,
} }
if has_reference: if (possible_reference_browser and
decorators.IsEnabled(test_class, possible_reference_browser)):
output['steps'][base_name + '.reference'] = { output['steps'][base_name + '.reference'] = {
'cmd': ' '.join(base_cmd + [ 'cmd': ' '.join(base_cmd + [
'--browser=reference', '--output-trace-tag=_ref']), '--browser=reference', '--output-trace-tag=_ref']),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment