summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 01:12:30 +0000
committersimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 01:12:30 +0000
commit6edd060869e0cc78544a947c768e48422d499375 (patch)
treef83ba796bfaa35a230cdd2aad88f61954aaca049
parentedc76592019e1effb972c5757566e35ac6b1dfff (diff)
downloadchromium_src-6edd060869e0cc78544a947c768e48422d499375.zip
chromium_src-6edd060869e0cc78544a947c768e48422d499375.tar.gz
chromium_src-6edd060869e0cc78544a947c768e48422d499375.tar.bz2
Disable page_cycler.typical_25 on windows, and session_restore.cold.typical_25 on linux.
NOTRY=true BUG=273986, 325479 Review URL: https://codereview.chromium.org/103153002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238516 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/perf/benchmarks/page_cycler.py4
-rw-r--r--tools/perf/benchmarks/session_restore.py4
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/benchmarks/page_cycler.py b/tools/perf/benchmarks/page_cycler.py
index b9a0b8c..54093d7 100644
--- a/tools/perf/benchmarks/page_cycler.py
+++ b/tools/perf/benchmarks/page_cycler.py
@@ -1,6 +1,8 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import sys
+
from telemetry import test
from measurements import page_cycler
@@ -103,6 +105,8 @@ class PageCyclerToughLayoutCases(test.Test):
class PageCyclerTypical25(test.Test):
+ # crbug.com/273986: This test is really flakey on xp.
+ enabled = not sys.platform.startswith('win')
test = page_cycler.PageCycler
page_set = 'page_sets/typical_25.json'
options = {'pageset_repeat_iters': 10}
diff --git a/tools/perf/benchmarks/session_restore.py b/tools/perf/benchmarks/session_restore.py
index 016d482..d82dd04 100644
--- a/tools/perf/benchmarks/session_restore.py
+++ b/tools/perf/benchmarks/session_restore.py
@@ -1,12 +1,16 @@
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import sys
+
from telemetry import test
from measurements import session_restore
class SessionRestoreColdTypical25(test.Test):
+ # crbug.com/325479: Disabling this test for now since it never ran before.
+ enabled = not sys.platform.startswith('linux')
tag = 'cold'
test = session_restore.SessionRestore
page_set = 'page_sets/typical_25.json'