diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/client/windows/breakpad_client.gyp | 1 | ||||
| -rw-r--r-- | src/client/windows/handler/exception_handler.cc | 2 | ||||
| -rwxr-xr-x | src/client/windows/unittests/client_tests.gyp | 20 | ||||
| -rwxr-xr-x | src/client/windows/unittests/exception_handler_test.cc | 58 |
4 files changed, 77 insertions, 4 deletions
diff --git a/src/client/windows/breakpad_client.gyp b/src/client/windows/breakpad_client.gyp index ddcb7ced..ae26b91d 100755 --- a/src/client/windows/breakpad_client.gyp +++ b/src/client/windows/breakpad_client.gyp @@ -60,6 +60,7 @@ '<(DEPTH)/common/windows/guid_string.h', '<(DEPTH)/common/windows/http_upload.cc', '<(DEPTH)/common/windows/http_upload.h', + '<(DEPTH)/common/windows/string_utils.cc', ] } ] diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc index 7af20ce7..f02544cd 100644 --- a/src/client/windows/handler/exception_handler.cc +++ b/src/client/windows/handler/exception_handler.cc @@ -560,7 +560,7 @@ void ExceptionHandler::HandleInvalidParameter(const wchar_t* expression, // static void ExceptionHandler::HandlePureVirtualCall() { - // This is an pure virtual funciton call, not an exception. It's safe to + // This is an pure virtual function call, not an exception. It's safe to // play with sprintf here. AutoExceptionHandler auto_exception_handler; ExceptionHandler* current_handler = auto_exception_handler.get_handler(); diff --git a/src/client/windows/unittests/client_tests.gyp b/src/client/windows/unittests/client_tests.gyp index 5c5ef479..6563ecf0 100755 --- a/src/client/windows/unittests/client_tests.gyp +++ b/src/client/windows/unittests/client_tests.gyp @@ -50,7 +50,27 @@ '../crash_generation/crash_generation.gyp:crash_generation_server', '../crash_generation/crash_generation.gyp:crash_generation_client', '../handler/exception_handler.gyp:exception_handler', + 'processor_bits', ] }, + { + 'target_name': 'processor_bits', + 'type': 'static_library', + 'include_dirs': [ + '<(DEPTH)', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(DEPTH)', + ] + }, + 'sources': [ + '<(DEPTH)/common/string_conversion.cc', + '<(DEPTH)/processor/basic_code_modules.cc', + '<(DEPTH)/processor/logging.cc', + '<(DEPTH)/processor/minidump.cc', + '<(DEPTH)/processor/pathname_stripper.cc', + ] + } ], } diff --git a/src/client/windows/unittests/exception_handler_test.cc b/src/client/windows/unittests/exception_handler_test.cc index ed1cec64..f0341880 100755 --- a/src/client/windows/unittests/exception_handler_test.cc +++ b/src/client/windows/unittests/exception_handler_test.cc @@ -33,12 +33,20 @@ #include <objbase.h> #include <shellapi.h> +#include <string> + #include "../../../breakpad_googletest_includes.h" +#include "../../../../common/windows/string_utils-inl.h" +#include "../../../../google_breakpad/processor/minidump.h" #include "../crash_generation/crash_generation_server.h" #include "../handler/exception_handler.h" #include "dump_analysis.h" // NOLINT namespace { + +using std::wstring; +using namespace google_breakpad; + const wchar_t kPipeName[] = L"\\\\.\\pipe\\BreakpadCrashTest\\TestCaseServer"; const char kSuccessIndicator[] = "success"; const char kFailureIndicator[] = "failure"; @@ -72,6 +80,13 @@ class ExceptionHandlerTest : public ::testing::Test { const google_breakpad::ClientInfo *client_info, const std::wstring *dump_path); + static bool DumpCallback(const wchar_t* dump_path, + const wchar_t* minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool succeeded); + static std::wstring dump_file; static std::wstring full_dump_file; }; @@ -119,15 +134,30 @@ BOOL ExceptionHandlerTest::DoesPathExist(const TCHAR *path_name) { return TRUE; } +// static void ExceptionHandlerTest::ClientDumpCallback( void *dump_context, const google_breakpad::ClientInfo *client_info, - const std::wstring *dump_path) { + const wstring *dump_path) { dump_file = *dump_path; // Create the full dump file name from the dump path. full_dump_file = dump_file.substr(0, dump_file.length() - 4) + L"-full.dmp"; } +// static +bool ExceptionHandlerTest::DumpCallback(const wchar_t* dump_path, + const wchar_t* minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool succeeded) { + dump_file = dump_path; + dump_file += L"\\"; + dump_file += minidump_id; + dump_file += L".dmp"; + return succeeded; +} + void ExceptionHandlerTest::DoCrashInvalidParameter() { google_breakpad::ExceptionHandler *exc = new google_breakpad::ExceptionHandler( @@ -188,7 +218,7 @@ TEST_F(ExceptionHandlerTest, InvalidParameterMiniDumpTest) { // Call with a bad argument ASSERT_TRUE(DoesPathExist(temp_path_)); - std::wstring dump_path(temp_path_); + wstring dump_path(temp_path_); google_breakpad::CrashGenerationServer server( kPipeName, NULL, NULL, NULL, ClientDumpCallback, NULL, NULL, NULL, true, &dump_path); @@ -259,7 +289,7 @@ TEST_F(ExceptionHandlerTest, PureVirtualCallMiniDumpTest) { // Call with a bad argument ASSERT_TRUE(DoesPathExist(temp_path_)); - std::wstring dump_path(temp_path_); + wstring dump_path(temp_path_); google_breakpad::CrashGenerationServer server( kPipeName, NULL, NULL, NULL, ClientDumpCallback, NULL, NULL, NULL, true, &dump_path); @@ -322,4 +352,26 @@ TEST_F(ExceptionHandlerTest, PureVirtualCallMiniDumpTest) { EXPECT_FALSE(mini.HasStream(TokenStream)); EXPECT_FALSE(full.HasStream(TokenStream)); } + +// Test that writing a minidump produces a valid minidump containing +// some expected structures. +TEST_F(ExceptionHandlerTest, WriteMinidumpTest) { + ExceptionHandler handler(temp_path_, + NULL, + DumpCallback, + NULL, + ExceptionHandler::HANDLER_ALL); + ASSERT_TRUE(handler.WriteMinidump()); + ASSERT_FALSE(dump_file.empty()); + + string minidump_filename; + ASSERT_TRUE(WindowsStringUtils::safe_wcstombs(dump_file, + &minidump_filename)); + + // Read the minidump and verify some info. + Minidump minidump(minidump_filename); + ASSERT_TRUE(minidump.Read()); + //TODO(ted): more comprehensive tests... } + +} // namespace |