Commit bd147204 authored by thakis@chromium.org's avatar thakis@chromium.org

Remove container overflow tests for Vectors with inline capacity

since builds with these checks have inline capacity disabled.

R=thakis@chromium.org, inferno@chromium.org
TBR=thakis
BUG=524162

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

git-svn-id: svn://svn.chromium.org/blink/trunk@201136 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 826f96b8
...@@ -286,7 +286,7 @@ TEST(VectorTest, SwapWithInlineCapacity) ...@@ -286,7 +286,7 @@ TEST(VectorTest, SwapWithInlineCapacity)
vectorB.swap(vectorA); vectorB.swap(vectorA);
} }
#if defined(ADDRESS_SANITIZER) #if defined(ANNOTATE_CONTIGUOUS_CONTAINER)
TEST(VectorTest, ContainerAnnotations) TEST(VectorTest, ContainerAnnotations)
{ {
Vector<int> vectorA; Vector<int> vectorA;
...@@ -325,52 +325,7 @@ TEST(VectorTest, ContainerAnnotations) ...@@ -325,52 +325,7 @@ TEST(VectorTest, ContainerAnnotations)
volatile int* intPointerB3 = vectorB.data(); volatile int* intPointerB3 = vectorB.data();
EXPECT_DEATH((void)intPointerB3[2], "container-overflow"); EXPECT_DEATH((void)intPointerB3[2], "container-overflow");
} }
#endif // defined(ANNOTATE_CONTIGUOUS_CONTAINER)
TEST(VectorTest, ContainerAnnotationsInline)
{
Vector<int> vectorA;
Vector<int, 4> vectorB;
vectorB.append(1);
vectorB.append(2);
volatile int* intPointerB = vectorB.data();
EXPECT_DEATH((void)intPointerB[2], "container-overflow");
vectorB.append(3);
vectorB.append(4);
vectorB.append(5);
vectorB.reserveCapacity(16);
intPointerB = vectorB.data();
EXPECT_DEATH((void)intPointerB[5], "container-overflow");
vectorB.clear();
vectorB.shrinkToFit();
vectorB.append(1);
intPointerB = vectorB.data();
EXPECT_DEATH((void)intPointerB[1], "container-overflow");
vectorB.shrinkToFit();
intPointerB = vectorB.data();
EXPECT_DEATH((void)intPointerB[1], "container-overflow");
vectorA = vectorB;
vectorA.reserveCapacity(8);
volatile int* intPointerA = vectorA.data();
EXPECT_DEATH((void)intPointerA[1], "container-overflow");
Vector<int, 4> vectorC;
vectorC.append(3);
vectorC.append(4);
vectorB.swap(vectorC);
intPointerB = vectorB.data();
vectorC.reserveCapacity(8);
volatile int* intPointerC = vectorC.data();
vectorC[0] = 2;
vectorB[1] = 1337;
EXPECT_DEATH((void)intPointerC[1], "container-overflow");
EXPECT_DEATH((void)intPointerB[2], "container-overflow");
}
#endif // defined(ADDRESS_SANITIZER)
class Comparable { class Comparable {
}; };
......
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