From 3ef57580d094c6d7444ba39b0fa944115b901dd4 Mon Sep 17 00:00:00 2001 From: "jbates@chromium.org" Date: Wed, 29 Feb 2012 05:46:35 +0000 Subject: Make StackContainer test pass on Android. Failure output from experimental Android builder: [ RUN ] StackContainer.BufferAlignment base/stack_container_unittest.cc:126: Failure Value of: reinterpret_cast(&aligned256[0]) & (256 - 1) Actual: 80 Expected: 0u Which is: 0 [ FAILED ] StackContainer.BufferAlignment (1 ms) BUG=115612 Review URL: http://codereview.chromium.org/9456032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124126 0039d316-1c4b-4281-b951-d872f2087c98 --- base/stack_container_unittest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'base/stack_container_unittest.cc') diff --git a/base/stack_container_unittest.cc b/base/stack_container_unittest.cc index 175df36..798add7 100644 --- a/base/stack_container_unittest.cc +++ b/base/stack_container_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 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 // found in the LICENSE file. @@ -121,9 +121,17 @@ TEST(StackContainer, BufferAlignment) { doubles->push_back(0.0); EXPECT_ALIGNED(&doubles[0], ALIGNOF(double)); + StackVector, 1> aligned16; + aligned16->push_back(AlignedData<16>()); + EXPECT_ALIGNED(&aligned16[0], 16); + +#if !defined(OS_ANDROID) + // It seems that android doesn't respect greater than 16 byte alignment for + // non-POD data on the stack, even though ALIGNOF(aligned256) == 256. StackVector, 1> aligned256; aligned256->push_back(AlignedData<256>()); EXPECT_ALIGNED(&aligned256[0], 256); +#endif } #ifdef COMPILER_MSVC -- cgit v1.1