summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-13 03:13:51 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-13 03:13:51 +0000
commit2f076b0b0e2c7f9a02174aeeda67abceb567388e (patch)
tree95399654f21650f9f6374e3cecd6d93e88dbf52c
parentb6e04815ad17875a9e2db1214301a2b676db33ee (diff)
downloadchromium_src-2f076b0b0e2c7f9a02174aeeda67abceb567388e.zip
chromium_src-2f076b0b0e2c7f9a02174aeeda67abceb567388e.tar.gz
chromium_src-2f076b0b0e2c7f9a02174aeeda67abceb567388e.tar.bz2
Temporarily disable FencedAllocator.TestAlignment on windows
BUG=226750 TBR=hshi Review URL: https://codereview.chromium.org/13935003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194085 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/client/fenced_allocator_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index c20558d..4c32f2e 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -464,7 +464,13 @@ TEST_F(FencedAllocatorWrapperTest, TestAllocZero) {
}
// Checks that allocation offsets are aligned to multiples of 16 bytes.
-TEST_F(FencedAllocatorWrapperTest, TestAlignment) {
+#if defined(OS_WIN)
+// See crbug/226750
+#define MAYBE_TestAlignment DISABLED_TestAlignment
+#else
+#define MAYBE_TestAlignment TestAlignment
+#endif
+TEST_F(FencedAllocatorWrapperTest, MAYBE_TestAlignment) {
allocator_->CheckConsistency();
const unsigned int kSize1 = 75;