diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 17:14:53 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-04 14:29:45 +0100 |
| commit | c407dc5cd9bdc5668497f21b26b09d988ab439de (patch) | |
| tree | 7eaf8707c0309516bdb042ad976feedaf72b0bb1 /base/allocator/allocator_unittests.cc | |
| parent | 0998b1cdac5733f299c12d88bc31ef9c8035b8fa (diff) | |
| download | external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.zip external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.gz external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.bz2 | |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
Diffstat (limited to 'base/allocator/allocator_unittests.cc')
| -rw-r--r-- | base/allocator/allocator_unittests.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/allocator/allocator_unittests.cc b/base/allocator/allocator_unittests.cc index 919cfab..b1aa9cb 100644 --- a/base/allocator/allocator_unittests.cc +++ b/base/allocator/allocator_unittests.cc @@ -402,12 +402,12 @@ TEST(Allocators, Realloc1) { // The larger the start-size, the larger the non-reallocing delta. for (int d = 0; d < s*2; ++d) { void* new_p = realloc(p, start_sizes[s] + deltas[d]); - CHECK(p == new_p); // realloc should not allocate new memory + CHECK_EQ(p, new_p); // realloc should not allocate new memory } // Test again, but this time reallocing smaller first. for (int d = 0; d < s*2; ++d) { void* new_p = realloc(p, start_sizes[s] - deltas[d]); - CHECK(p == new_p); // realloc should not allocate new memory + CHECK_EQ(p, new_p); // realloc should not allocate new memory } free(p); } @@ -487,4 +487,3 @@ int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } - |