| Index: tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| index 6be6499b6805d7fce926cc53adf04773bf33dc5d..7e9d67dff2b1122972d071bbb11bece3e1a7670f 100644
|
| --- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| +++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| @@ -84,6 +84,8 @@ def SmokeTestGenerator(benchmark):
|
|
|
|
|
| # The list of benchmark modules to be excluded from our smoke tests.
|
| +# TODO(nednguyen): remove black listing by module & change this to black listing
|
| +# by specific benchmark.
|
| _BLACK_LIST_TEST_MODULES = {
|
| image_decoding, # Always fails on Mac10.9 Tests builder.
|
| indexeddb_perf, # Always fails on Win7 & Android Tests builder.
|
| @@ -113,18 +115,11 @@ def load_tests(loader, standard_tests, pattern):
|
| benchmarks_dir = os.path.dirname(__file__)
|
| top_level_dir = os.path.dirname(benchmarks_dir)
|
|
|
| - # Using the default of |index_by_class_name=False| means that if a module
|
| - # has multiple benchmarks, only the last one is returned.
|
| all_benchmarks = discover.DiscoverClasses(
|
| - benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
|
| - index_by_class_name=False).values()
|
| + benchmarks_dir, top_level_dir, benchmark_module.Benchmark).values()
|
| for benchmark in all_benchmarks:
|
| if sys.modules[benchmark.__module__] in _BLACK_LIST_TEST_MODULES:
|
| continue
|
| - # TODO(tonyg): Smoke doesn't work with session_restore yet.
|
| - if (benchmark.Name().startswith('session_restore') or
|
| - benchmark.Name().startswith('skpicture_printer')):
|
| - continue
|
|
|
| if hasattr(benchmark, 'generated_profile_archive'):
|
| # We'd like to test these, but don't know how yet.
|
|
|