Enable aligned_memory_unittest.cc on iOS.

base/memory/aligned_memory_unittest.cc

Index: base/memory/aligned_memory_unittest.cc
diff --git a/base/memory/aligned_memory_unittest.cc b/base/memory/aligned_memory_unittest.cc
index 065e9522a9853ba5bb42f68509214255f2d34211..e281c57f406f7f689fd435d0563e8322d3462037 100644
--- a/base/memory/aligned_memory_unittest.cc
+++ b/base/memory/aligned_memory_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.
 
@@ -34,17 +34,21 @@ TEST(AlignedMemoryTest, StackAlignment) {
   AlignedMemory<8, 8> raw8;
   AlignedMemory<8, 16> raw16;
   AlignedMemory<8, 256> raw256;
-  AlignedMemory<8, 4096> raw4096;
 
   EXPECT_EQ(8u, ALIGNOF(raw8));
   EXPECT_EQ(16u, ALIGNOF(raw16));
   EXPECT_EQ(256u, ALIGNOF(raw256));
-  EXPECT_EQ(4096u, ALIGNOF(raw4096));
 
   EXPECT_ALIGNED(raw8.void_data(), 8);
   EXPECT_ALIGNED(raw16.void_data(), 16);
   EXPECT_ALIGNED(raw256.void_data(), 256);
+
+  // TODO(ios): This test hits an armv7 bug in clang. crbug.com/138066
+#if !defined(OS_IOS) || !defined(ARCH_CPU_ARM_FAMILY)

[Mark Mentovai, 2012/07/19 17:57:09]

The intent is a little clearer, I think, if you write:

if !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY))

[leng, 2012/07/20 08:37:47]

Agreed.  Done.

+  AlignedMemory<8, 4096> raw4096;
+  EXPECT_EQ(4096u, ALIGNOF(raw4096));
   EXPECT_ALIGNED(raw4096.void_data(), 4096);
+#endif  // !OS_IOS

[Mark Mentovai, 2012/07/19 17:57:09]

Adjust this to match the #if.

[leng, 2012/07/20 08:37:47]

Done.

 }
 
 }  // namespace