Commit 66fd1647 authored by kbr@chromium.org's avatar kbr@chromium.org

Suppress Memory.CSS3D failure on MacBook Pro Retina Display.

BUG=368037
TBR=bajones@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266838 0039d316-1c4b-4281-b951-d872f2087c98
parent 624bce96
# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import memory_expectations
from telemetry import test from telemetry import test
from telemetry.page import page_test from telemetry.page import page_test
from telemetry.core.timeline import counter from telemetry.core.timeline import counter
...@@ -83,6 +85,9 @@ class Memory(test.Test): ...@@ -83,6 +85,9 @@ class Memory(test.Test):
test = _MemoryValidator test = _MemoryValidator
page_set = 'page_sets/memory_tests.py' page_set = 'page_sets/memory_tests.py'
def CreateExpectations(self, page_set):
return memory_expectations.MemoryExpectations()
def CreatePageSet(self, options): def CreatePageSet(self, options):
page_set = super(Memory, self).CreatePageSet(options) page_set = super(Memory, self).CreatePageSet(options)
for page in page_set.pages: for page in page_set.pages:
......
# Copyright 2014 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.
from telemetry.page import test_expectations
# Valid expectation conditions are:
#
# Operating systems:
# win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
# linux, chromeos, android
#
# GPU vendors:
# amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,
# vivante
#
# Specific GPUs can be listed as a tuple with vendor name and device ID.
# Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604')
# Device IDs must be paired with a GPU vendor.
class MemoryExpectations(test_expectations.TestExpectations):
def SetExpectations(self):
# Sample Usage:
# self.Fail('Maps.maps_001',
# ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
self.Fail('Memory.CSS3D', ['mac', ('nvidia', 0x0fd5)], bug=368037)
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