diff options
author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 02:31:12 +0000 |
---|---|---|
committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 02:31:12 +0000 |
commit | ef59a1c16f4f3bc4937f1f6891d5d2e02d746660 (patch) | |
tree | 353e0b6635b87a451efce7450c43742ae0825392 /tools/perf | |
parent | 27630a3ee5c41c0c8b6c78d75ed6df54c5ff64a2 (diff) | |
download | chromium_src-ef59a1c16f4f3bc4937f1f6891d5d2e02d746660.zip chromium_src-ef59a1c16f4f3bc4937f1f6891d5d2e02d746660.tar.gz chromium_src-ef59a1c16f4f3bc4937f1f6891d5d2e02d746660.tar.bz2 |
[Telemetry] Disable rasterize and record and rasterize and record micro on mac.
They DCHECK during telemetry unittests which run with dchecks enabled.
BUG=350684
NOTRY=True
TBR=ernstm@chromium.org
Review URL: https://codereview.chromium.org/192173002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/benchmarks/rasterize_and_record.py | 12 | ||||
-rw-r--r-- | tools/perf/benchmarks/rasterize_and_record_micro.py | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/tools/perf/benchmarks/rasterize_and_record.py b/tools/perf/benchmarks/rasterize_and_record.py index 98b62ca..173c8af 100644 --- a/tools/perf/benchmarks/rasterize_and_record.py +++ b/tools/perf/benchmarks/rasterize_and_record.py @@ -8,10 +8,11 @@ from benchmarks import silk_flags from measurements import rasterize_and_record -# RasterizeAndRecord disabled on linux because no raster times are reported. -# TODO: re-enable when unittests are happy on linux. +# RasterizeAndRecord disabled on linux because no raster times are reported and +# on mac because Chrome DCHECKS. +# TODO: Re-enable when unittests are happy on linux and mac: crbug.com/350684. -@test.Disabled('linux') +@test.Disabled('linux', 'mac') class RasterizeAndRecordTop25(test.Test): """Measures rasterize and record performance on the top 25 web pages. @@ -20,7 +21,7 @@ class RasterizeAndRecordTop25(test.Test): page_set = 'page_sets/top_25.json' -@test.Disabled('linux') +@test.Disabled('linux', 'mac') class RasterizeAndRecordKeyMobileSites(test.Test): """Measures rasterize and record performance on the key mobile sites. @@ -29,7 +30,7 @@ class RasterizeAndRecordKeyMobileSites(test.Test): page_set = 'page_sets/key_mobile_sites.json' -@test.Disabled('linux') +@test.Disabled('linux', 'mac') class RasterizeAndRecordSilk(test.Test): """Measures rasterize and record performance on the silk sites. @@ -38,6 +39,7 @@ class RasterizeAndRecordSilk(test.Test): page_set = 'page_sets/key_silk_cases.json' +@test.Disabled('linux', 'mac') class RasterizeAndRecordFastPathSilk(test.Test): """Measures rasterize and record performance on the silk sites. diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py index 892449e..38eb698 100644 --- a/tools/perf/benchmarks/rasterize_and_record_micro.py +++ b/tools/perf/benchmarks/rasterize_and_record_micro.py @@ -7,7 +7,10 @@ from measurements import rasterize_and_record_micro from telemetry import test -@test.Disabled('android', 'linux') +# RasterizeAndRecord disabled on mac because Chrome DCHECKS. +# TODO: Re-enable when unittests are happy: crbug.com/350684. + +@test.Disabled('android', 'linux', 'mac') class RasterizeAndRecordMicroTop25(test.Test): """Measures rasterize and record performance on the top 25 web pages. @@ -16,6 +19,7 @@ class RasterizeAndRecordMicroTop25(test.Test): page_set = 'page_sets/top_25.json' +@test.Disabled('mac') class RasterizeAndRecordMicroKeyMobileSites(test.Test): """Measures rasterize and record performance on the key mobile sites. @@ -24,6 +28,7 @@ class RasterizeAndRecordMicroKeyMobileSites(test.Test): page_set = 'page_sets/key_mobile_sites.json' +@test.Disabled('mac') class RasterizeAndRecordMicroKeySilkCases(test.Test): """Measures rasterize and record performance on the silk sites. @@ -32,6 +37,7 @@ class RasterizeAndRecordMicroKeySilkCases(test.Test): page_set = 'page_sets/key_silk_cases.json' +@test.Disabled('mac') class RasterizeAndRecordMicroFastPathKeySilkCases(test.Test): """Measures rasterize and record performance on the silk sites. |