| Index: telemetry/telemetry/internal/story_runner.py
|
| diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
|
| index 278a4cf358b60daeb1cfd9367a650b7e86f7e97f..8a73496f195fe5d26461c1896cf9d81fd176e988 100644
|
| --- a/telemetry/telemetry/internal/story_runner.py
|
| +++ b/telemetry/telemetry/internal/story_runner.py
|
| @@ -280,6 +280,7 @@ def RunBenchmark(benchmark, finder_options):
|
| """
|
| benchmark.CustomizeBrowserOptions(finder_options.browser_options)
|
|
|
| + benchmark_metadata = benchmark.GetMetadata()
|
| possible_browser = browser_finder.FindBrowser(finder_options)
|
| if possible_browser and benchmark.ShouldDisable(possible_browser):
|
| logging.warning('%s is disabled on the selected browser', benchmark.Name())
|
| @@ -289,6 +290,12 @@ def RunBenchmark(benchmark, finder_options):
|
| else:
|
| logging.warning(
|
| 'Try --also-run-disabled-tests to force the benchmark to run.')
|
| + # If chartjson is specified, this will print a dict indicating the
|
| + # benchmark name and disabled state. crrev.com/2265423005 will update
|
| + # this return value once this logic is plumbed through the recipe.
|
| + with results_options.CreateResults(benchmark_metadata, finder_options,
|
| + benchmark.ValueCanBeAddedPredicate) as results:
|
| + results.PrintDisabledSummary()
|
| return 1
|
|
|
| pt = benchmark.CreatePageTest(finder_options)
|
| @@ -317,7 +324,7 @@ def RunBenchmark(benchmark, finder_options):
|
| not benchmark.IsShouldTearDownStateAfterEachStoryRunOverriden()):
|
| should_tear_down_state_after_each_story_run = False
|
|
|
| - benchmark_metadata = benchmark.GetMetadata()
|
| +
|
| with results_options.CreateResults(
|
| benchmark_metadata, finder_options,
|
| benchmark.ValueCanBeAddedPredicate) as results:
|
|
|