diff options
| author | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
|---|---|---|
| committer | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
| commit | 6de969a3040fa31ba60302c66613d1d2e6f5a730 (patch) | |
| tree | aad9de34e00834709440f01cb0f54e315989490e /src/client/linux/handler/exception_handler_unittest.cc | |
| parent | Fix Android build of client library (diff) | |
| download | breakpad-6de969a3040fa31ba60302c66613d1d2e6f5a730.tar.xz | |
This change allows compiling the google-breakpad code using a global ::string class instead of std::string. For more details take a look at common/using_std_string.h
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@974 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/handler/exception_handler_unittest.cc')
| -rw-r--r-- | src/client/linux/handler/exception_handler_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc index 6fcf251b..f9314729 100644 --- a/src/client/linux/handler/exception_handler_unittest.cc +++ b/src/client/linux/handler/exception_handler_unittest.cc @@ -45,6 +45,7 @@ #include "common/linux/file_id.h" #include "common/linux/linux_libc_support.h" #include "common/tests/auto_tempdir.h" +#include "common/using_std_string.h" #include "third_party/lss/linux_syscall_support.h" #include "google_breakpad/processor/minidump.h" @@ -130,7 +131,7 @@ TEST(ExceptionHandlerTest, ChildCrash) { filename[len] = 0; close(fds[0]); - const std::string minidump_filename = temp_dir.path() + "/" + filename + + const string minidump_filename = temp_dir.path() + "/" + filename + ".dmp"; struct stat st; @@ -204,7 +205,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemory) { filename[len] = 0; close(fds[0]); - const std::string minidump_filename = temp_dir.path() + "/" + filename + + const string minidump_filename = temp_dir.path() + "/" + filename + ".dmp"; struct stat st; @@ -329,7 +330,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) { filename[len] = 0; close(fds[0]); - const std::string minidump_filename = temp_dir.path() + "/" + filename + + const string minidump_filename = temp_dir.path() + "/" + filename + ".dmp"; struct stat st; @@ -454,7 +455,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) { filename[len] = 0; close(fds[0]); - const std::string minidump_filename = temp_dir.path() + "/" + filename + + const string minidump_filename = temp_dir.path() + "/" + filename + ".dmp"; struct stat st; @@ -555,7 +556,7 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryNullPointer) { filename[len] = 0; close(fds[0]); - const std::string minidump_filename = temp_dir.path() + "/" + filename + + const string minidump_filename = temp_dir.path() + "/" + filename + ".dmp"; struct stat st; @@ -767,7 +768,7 @@ TEST(ExceptionHandlerTest, ExternalDumper) { ASSERT_NE(signal_fd, -1); AutoTempDir temp_dir; - std::string templ = temp_dir.path() + "/exception-handler-unittest"; + string templ = temp_dir.path() + "/exception-handler-unittest"; ASSERT_TRUE(WriteMinidump(templ.c_str(), crashing_pid, context, kCrashContextSize)); static const char b = 0; |