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/minidump_writer/minidump_writer_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/minidump_writer/minidump_writer_unittest.cc')
| -rw-r--r-- | src/client/linux/minidump_writer/minidump_writer_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/client/linux/minidump_writer/minidump_writer_unittest.cc index 91aafed7..b751f50a 100644 --- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc +++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -44,6 +44,7 @@ #include "common/linux/file_id.h" #include "common/linux/safe_readlink.h" #include "common/tests/auto_tempdir.h" +#include "common/using_std_string.h" #include "google_breakpad/processor/minidump.h" using namespace google_breakpad; @@ -74,7 +75,7 @@ TEST(MinidumpWriterTest, Setup) { memset(&context, 0, sizeof(context)); AutoTempDir temp_dir; - std::string templ = temp_dir.path() + "/minidump-writer-unittest"; + string templ = temp_dir.path() + "/minidump-writer-unittest"; // Set a non-zero tid to avoid tripping asserts. context.tid = 1; ASSERT_TRUE(WriteMinidump(templ.c_str(), child, &context, sizeof(context))); @@ -139,7 +140,7 @@ TEST(MinidumpWriterTest, MappingInfo) { context.tid = 1; AutoTempDir temp_dir; - std::string templ = temp_dir.path() + "/minidump-writer-unittest"; + string templ = temp_dir.path() + "/minidump-writer-unittest"; // Add information about the mapped memory. MappingInfo info; @@ -207,7 +208,7 @@ TEST(MinidumpWriterTest, MappingInfoContained) { // mmap a file AutoTempDir temp_dir; - std::string tempfile = temp_dir.path() + "/minidump-writer-unittest-temp"; + 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.c_str()); @@ -242,7 +243,7 @@ TEST(MinidumpWriterTest, MappingInfoContained) { memset(&context, 0, sizeof(context)); context.tid = 1; - std::string dumpfile = temp_dir.path() + "/minidump-writer-unittest"; + string dumpfile = temp_dir.path() + "/minidump-writer-unittest"; // Add information about the mapped memory. Report it as being larger than // it actually is. @@ -303,7 +304,7 @@ TEST(MinidumpWriterTest, DeletedBinary) { // Copy binary to a temp file. AutoTempDir temp_dir; - std::string binpath = temp_dir.path() + "/linux-dumper-unittest-helper"; + 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.c_str()); @@ -349,7 +350,7 @@ TEST(MinidumpWriterTest, DeletedBinary) { ExceptionHandler::CrashContext context; memset(&context, 0, sizeof(context)); - std::string templ = temp_dir.path() + "/minidump-writer-unittest"; + string templ = temp_dir.path() + "/minidump-writer-unittest"; // Set a non-zero tid to avoid tripping asserts. context.tid = 1; ASSERT_TRUE(WriteMinidump(templ.c_str(), child_pid, &context, |