Correct compilation warning.

 1) Modify src/common/mac/macho_walker.cc to remove a signed  vs unsigned comparison.

 2) Replace mktemp in test using AutoTmpDir that has been moved from client/mac/tests to common/tests.
Review URL: http://breakpad.appspot.com/328001

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@888 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 61 insertions, 67 deletions

diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
index 7186db9f..73e5c4c2 100644
--- a/src/client/linux/handler/exception_handler_unittest.cc
+++ b/src/client/linux/handler/exception_handler_unittest.cc
@@ -44,17 +44,12 @@
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
+#include "common/tests/auto_tempdir.h"
 #include "third_party/lss/linux_syscall_support.h"
 #include "google_breakpad/processor/minidump.h"
 
 using namespace google_breakpad;
 
-#if !defined(__ANDROID__)
-#define TEMPDIR "/tmp"
-#else
-#define TEMPDIR "/data/local/tmp"
-#endif
-
 // Length of a formatted GUID string =
 // sizeof(MDGUID) * 2 + 4 (for dashes) + 1 (null terminator)
 const int kGUIDStringSize = 37;
@@ -79,7 +74,8 @@ class ExceptionHandlerTest : public ::testing::Test {
 };
 
 TEST(ExceptionHandlerTest, Simple) {
-  ExceptionHandler handler(TEMPDIR, NULL, NULL, NULL, true);
+  AutoTempDir temp_dir;
+  ExceptionHandler handler(temp_dir.path(), NULL, NULL, NULL, true);
 }
 
 static bool DoneCallback(const char* dump_path,
@@ -99,13 +95,14 @@ static bool DoneCallback(const char* dump_path,
 }
 
 TEST(ExceptionHandlerTest, ChildCrash) {
+  AutoTempDir temp_dir;
   int fds[2];
   ASSERT_NE(pipe(fds), -1);
 
   const pid_t child = fork();
   if (child == 0) {
     close(fds[0]);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds[1],
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback, (void*) fds[1],
                              true);
     *reinterpret_cast<volatile int*>(NULL) = 0;
   }
@@ -133,7 +130,7 @@ TEST(ExceptionHandlerTest, ChildCrash) {
   filename[len] = 0;
   close(fds[0]);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -145,6 +142,7 @@ TEST(ExceptionHandlerTest, ChildCrash) {
 // Test that memory around the instruction pointer is written
 // to the dump as a MinidumpMemoryRegion.
 TEST(ExceptionHandlerTest, InstructionPointerMemory) {
+  AutoTempDir temp_dir;
   int fds[2];
   ASSERT_NE(pipe(fds), -1);
 
@@ -158,8 +156,8 @@ TEST(ExceptionHandlerTest, InstructionPointerMemory) {
   const pid_t child = fork();
   if (child == 0) {
     close(fds[0]);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds[1],
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds[1], true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -206,7 +204,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemory) {
   filename[len] = 0;
   close(fds[0]);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -269,6 +267,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemory) {
 // Test that the memory region around the instruction pointer is
 // bounded correctly on the low end.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) {
+  AutoTempDir temp_dir;
   int fds[2];
   ASSERT_NE(pipe(fds), -1);
 
@@ -282,8 +281,8 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) {
   const pid_t child = fork();
   if (child == 0) {
     close(fds[0]);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds[1],
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds[1], true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -330,7 +329,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) {
   filename[len] = 0;
   close(fds[0]);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -390,6 +389,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) {
 // Test that the memory region around the instruction pointer is
 // bounded correctly on the high end.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
+  AutoTempDir temp_dir;
   int fds[2];
   ASSERT_NE(pipe(fds), -1);
 
@@ -406,8 +406,8 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
   const pid_t child = fork();
   if (child == 0) {
     close(fds[0]);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds[1],
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds[1], true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -454,7 +454,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
   filename[len] = 0;
   close(fds[0]);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -515,6 +515,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
 // Ensure that an extra memory block doesn't get added when the
 // instruction pointer is not in mapped memory.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryNullPointer) {
+  AutoTempDir temp_dir;
   int fds[2];
   ASSERT_NE(pipe(fds), -1);
 
@@ -522,8 +523,8 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryNullPointer) {
   const pid_t child = fork();
   if (child == 0) {
     close(fds[0]);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds[1],
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds[1], true);
     // Try calling a NULL pointer.
     typedef void (*void_function)(void);
     void_function memory_function =
@@ -554,7 +555,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryNullPointer) {
   filename[len] = 0;
   close(fds[0]);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -629,7 +630,8 @@ TEST(ExceptionHandlerTest, ModuleInfo) {
   ASSERT_TRUE(memory);
 
   string minidump_filename;
-  ExceptionHandler handler(TEMPDIR, NULL, SimpleCallback,
+  AutoTempDir temp_dir;
+  ExceptionHandler handler(temp_dir.path(), NULL, SimpleCallback,
                            (void*)&minidump_filename, true);
   // Add info about the anonymous memory mapping.
   handler.AddMappingInfo(kMemoryName,
@@ -756,9 +758,9 @@ TEST(ExceptionHandlerTest, ExternalDumper) {
   ASSERT_NE(crashing_pid, -1);
   ASSERT_NE(signal_fd, -1);
 
-  char templ[] = TEMPDIR "/exception-handler-unittest-XXXXXX";
-  mktemp(templ);
-  ASSERT_TRUE(WriteMinidump(templ, crashing_pid, context,
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/exception-handler-unittest";
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), crashing_pid, context,
                             kCrashContextSize));
   static const char b = 0;
   HANDLE_EINTR(write(signal_fd, &b, 1));
@@ -769,7 +771,7 @@ TEST(ExceptionHandlerTest, ExternalDumper) {
   ASSERT_EQ(WTERMSIG(status), SIGSEGV);
 
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
-  unlink(templ);
+  unlink(templ.c_str());
 }
diff --git a/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/client/linux/minidump_writer/minidump_writer_unittest.cc
index 5f6bb34a..41465268 100644
--- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc
@@ -42,16 +42,11 @@
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
+#include "common/tests/auto_tempdir.h"
 #include "google_breakpad/processor/minidump.h"
 
 using namespace google_breakpad;
 
-#if !defined(__ANDROID__)
-#define TEMPDIR "/tmp"
-#else
-#define TEMPDIR "/data/local/tmp"
-#endif
-
 // Length of a formatted GUID string =
 // sizeof(MDGUID) * 2 + 4 (for dashes) + 1 (null terminator)
 const int kGUIDStringSize = 37;
@@ -77,15 +72,14 @@ TEST(MinidumpWriterTest, Setup) {
   ExceptionHandler::CrashContext context;
   memset(&context, 0, sizeof(context));
 
-  char templ[] = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
   // Set a non-zero tid to avoid tripping asserts.
   context.tid = 1;
-  ASSERT_TRUE(WriteMinidump(templ, child, &context, sizeof(context)));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child, &context, sizeof(context)));
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
-  unlink(templ);
 
   close(fds[1]);
 }
@@ -143,8 +137,8 @@ TEST(MinidumpWriterTest, MappingInfo) {
   memset(&context, 0, sizeof(context));
   context.tid = 1;
 
-  char templ[] = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
 
   // Add information about the mapped memory.
   MappingInfo info;
@@ -158,12 +152,13 @@ TEST(MinidumpWriterTest, MappingInfo) {
   mapping.first = info;
   memcpy(mapping.second, kModuleGUID, sizeof(MDGUID));
   mappings.push_back(mapping);
-  ASSERT_TRUE(WriteMinidump(templ, child, &context, sizeof(context), mappings));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child, &context, sizeof(context),
+                            mappings));
 
   // Read the minidump. Load the module list, and ensure that
   // the mmap'ed |memory| is listed with the given module name
   // and debug ID.
-  Minidump minidump(templ);
+  Minidump minidump(templ.c_str());
   ASSERT_TRUE(minidump.Read());
 
   MinidumpModuleList* module_list = minidump.GetModuleList();
@@ -177,7 +172,6 @@ TEST(MinidumpWriterTest, MappingInfo) {
   EXPECT_EQ(kMemoryName, module->code_file());
   EXPECT_EQ(module_identifier, module->debug_identifier());
 
-  unlink(templ);
   close(fds[1]);
 }
 
@@ -211,11 +205,11 @@ TEST(MinidumpWriterTest, MappingInfoContained) {
   module_identifier += "0";
 
   // mmap a file
-  char tempfile[] = TEMPDIR "/minidump-writer-unittest-temp-XXXXXX";
-  mktemp(tempfile);
-  int fd = open(tempfile, O_RDWR | O_CREAT, 0);
+  AutoTempDir temp_dir;
+  std::string tempfile = temp_dir.path() + "/minidump-writer-unittest-temp";
+  int fd = open(tempfile.c_str(), O_RDWR | O_CREAT, 0);
   ASSERT_NE(-1, fd);
-  unlink(tempfile);
+  unlink(tempfile.c_str());
   // fill with zeros
   char buffer[kMemorySize];
   memset(buffer, 0, kMemorySize);
@@ -247,8 +241,7 @@ TEST(MinidumpWriterTest, MappingInfoContained) {
   memset(&context, 0, sizeof(context));
   context.tid = 1;
 
-  char dumpfile[] = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(dumpfile);
+  std::string dumpfile = temp_dir.path() + "/minidump-writer-unittest";
 
   // Add information about the mapped memory. Report it as being larger than
   // it actually is.
@@ -264,12 +257,13 @@ TEST(MinidumpWriterTest, MappingInfoContained) {
   memcpy(mapping.second, kModuleGUID, sizeof(MDGUID));
   mappings.push_back(mapping);
   ASSERT_TRUE(
-      WriteMinidump(dumpfile, child, &context, sizeof(context), mappings));
+      WriteMinidump(dumpfile.c_str(), child, &context, sizeof(context),
+                    mappings));
 
   // Read the minidump. Load the module list, and ensure that
   // the mmap'ed |memory| is listed with the given module name
   // and debug ID.
-  Minidump minidump(dumpfile);
+  Minidump minidump(dumpfile.c_str());
   ASSERT_TRUE(minidump.Read());
 
   MinidumpModuleList* module_list = minidump.GetModuleList();
@@ -283,7 +277,6 @@ TEST(MinidumpWriterTest, MappingInfoContained) {
   EXPECT_EQ(kMemoryName, module->code_file());
   EXPECT_EQ(module_identifier, module->debug_identifier());
 
-  unlink(dumpfile);
   close(fds[1]);
 }
 
@@ -308,12 +301,13 @@ TEST(MinidumpWriterTest, DeletedBinary) {
   helper_path += "linux_dumper_unittest_helper";
 
   // Copy binary to a temp file.
-  char binpath[] = TEMPDIR "/linux-dumper-unittest-helper-XXXXXX";
-  mktemp(binpath);
+  AutoTempDir temp_dir;
+  std::string binpath = temp_dir.path() + "/linux-dumper-unittest-helper";
   char cmdline[2 * PATH_MAX];
-  sprintf(cmdline, "/bin/cp \"%s\" \"%s\"", helper_path.c_str(), binpath);
+  sprintf(cmdline, "/bin/cp \"%s\" \"%s\"", helper_path.c_str(),
+          binpath.c_str());
   ASSERT_EQ(0, system(cmdline));
-  ASSERT_EQ(0, chmod(binpath, 0755));
+  ASSERT_EQ(0, chmod(binpath.c_str(), 0755));
 
   int fds[2];
   ASSERT_NE(-1, pipe(fds));
@@ -326,8 +320,8 @@ TEST(MinidumpWriterTest, DeletedBinary) {
     // Pass the pipe fd and the number of threads as arguments.
     char pipe_fd_string[8];
     sprintf(pipe_fd_string, "%d", fds[1]);
-    execl(binpath,
-          binpath,
+    execl(binpath.c_str(),
+          binpath.c_str(),
           pipe_fd_string,
           kNumberOfThreadsArgument,
           NULL);
@@ -348,32 +342,32 @@ TEST(MinidumpWriterTest, DeletedBinary) {
 
   // Child is ready now.
   // Unlink the test binary.
-  unlink(binpath);
+  unlink(binpath.c_str());
 
   ExceptionHandler::CrashContext context;
   memset(&context, 0, sizeof(context));
 
-  char templ[] = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
   // Set a non-zero tid to avoid tripping asserts.
   context.tid = 1;
-  ASSERT_TRUE(WriteMinidump(templ, child_pid, &context, sizeof(context)));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child_pid, &context,
+                            sizeof(context)));
   kill(child_pid, SIGKILL);
 
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
 
 
 
-  Minidump minidump(templ);
+  Minidump minidump(templ.c_str());
   ASSERT_TRUE(minidump.Read());
 
   // Check that the main module filename is correct.
   MinidumpModuleList* module_list = minidump.GetModuleList();
   ASSERT_TRUE(module_list);
   const MinidumpModule* module = module_list->GetMainModule();
-  EXPECT_STREQ(binpath, module->code_file().c_str());
+  EXPECT_STREQ(binpath.c_str(), module->code_file().c_str());
   // Check that the file ID is correct.
   FileID fileid(helper_path.c_str());
   uint8_t identifier[sizeof(MDGUID)];
@@ -391,6 +385,4 @@ TEST(MinidumpWriterTest, DeletedBinary) {
   // which is always zero on Linux.
   module_identifier += "0";
   EXPECT_EQ(module_identifier, module->debug_identifier());
-
-  unlink(templ);
 }