From 403124f9e2e31b8752f7835f3c86f4e91c20ed4e Mon Sep 17 00:00:00 2001 From: "benchan@chromium.org" Date: Fri, 27 Jan 2012 05:23:23 +0000 Subject: Fix test addresses to use uintptr_t instead of u_int64_t. When a variable is used to set (and lookup) MappingInfo's "start_addr" field, it needs to match types -- which is "uintptr_t". When Chrome OS updated the 'make' that's used for building, the 32-bit "char *" had sign-extended when cast up to a u_int64_t -- maybe because pointers were unsigned before and then changed to be signed -- and that caused the address lookup to fail. BUG=chromium-os:25355 TEST=Ran Breakpad unittests A=mkrebs@chromium.org Review URL: http://breakpad.appspot.com/345001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@908 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/linux/minidump_writer/minidump_writer_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/linux/minidump_writer/minidump_writer_unittest.cc') diff --git a/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/client/linux/minidump_writer/minidump_writer_unittest.cc index ee021ae3..ef1e7a54 100644 --- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc +++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -121,7 +121,7 @@ TEST(MinidumpWriterTest, MappingInfo) { MAP_PRIVATE | MAP_ANON, -1, 0)); - const u_int64_t kMemoryAddress = reinterpret_cast(memory); + const uintptr_t kMemoryAddress = reinterpret_cast(memory); ASSERT_TRUE(memory); const pid_t child = fork(); @@ -224,7 +224,7 @@ TEST(MinidumpWriterTest, MappingInfoContained) { MAP_PRIVATE, fd, 0)); - const u_int64_t kMemoryAddress = reinterpret_cast(memory); + const uintptr_t kMemoryAddress = reinterpret_cast(memory); ASSERT_TRUE(memory); close(fd); -- cgit v1.2.1