| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #include <windows.h> | 4 #include <windows.h> |
| 5 #include <objbase.h> | 5 #include <objbase.h> |
| 6 #include <dbghelp.h> | 6 #include <dbghelp.h> |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 << version->MinorVersion << "." << version->Revision; | 291 << version->MinorVersion << "." << version->Revision; |
| 292 | 292 |
| 293 HMODULE dbg_help = ::GetModuleHandle(L"dbghelp.dll"); | 293 HMODULE dbg_help = ::GetModuleHandle(L"dbghelp.dll"); |
| 294 ASSERT_TRUE(dbg_help != NULL); | 294 ASSERT_TRUE(dbg_help != NULL); |
| 295 | 295 |
| 296 wchar_t dbg_help_file[1024] = {}; | 296 wchar_t dbg_help_file[1024] = {}; |
| 297 ASSERT_TRUE(::GetModuleFileName(dbg_help, | 297 ASSERT_TRUE(::GetModuleFileName(dbg_help, |
| 298 dbg_help_file, | 298 dbg_help_file, |
| 299 arraysize(dbg_help_file))); | 299 arraysize(dbg_help_file))); |
| 300 scoped_ptr<FileVersionInfo> file_info( | 300 scoped_ptr<FileVersionInfo> file_info( |
| 301 FileVersionInfo::CreateFileVersionInfo(dbg_help_file)); | 301 FileVersionInfo::CreateFileVersionInfo(FilePath(dbg_help_file))); |
| 302 ASSERT_TRUE(file_info != NULL); | 302 ASSERT_TRUE(file_info != NULL); |
| 303 | 303 |
| 304 VLOG(1) << "DbgHelp.dll version: " << file_info->file_version(); | 304 VLOG(1) << "DbgHelp.dll version: " << file_info->file_version(); |
| 305 } | 305 } |
| 306 | 306 |
| 307 TEST_F(MinidumpTest, Normal) { | 307 TEST_F(MinidumpTest, Normal) { |
| 308 EXPECT_TRUE(WriteDump(MiniDumpNormal)); | 308 EXPECT_TRUE(WriteDump(MiniDumpNormal)); |
| 309 | 309 |
| 310 // We expect threads, modules and some memory. | 310 // We expect threads, modules and some memory. |
| 311 EXPECT_TRUE(DumpHasStream(ThreadListStream)); | 311 EXPECT_TRUE(DumpHasStream(ThreadListStream)); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 int main(int argc, char** argv) { | 432 int main(int argc, char** argv) { |
| 433 testing::InitGoogleTest(&argc, argv); | 433 testing::InitGoogleTest(&argc, argv); |
| 434 CommandLine::Init(argc, argv); | 434 CommandLine::Init(argc, argv); |
| 435 | 435 |
| 436 logging::InitLogging(L"CON", | 436 logging::InitLogging(L"CON", |
| 437 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 437 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
| 438 logging::DONT_LOCK_LOG_FILE, | 438 logging::DONT_LOCK_LOG_FILE, |
| 439 logging::APPEND_TO_OLD_LOG_FILE); | 439 logging::APPEND_TO_OLD_LOG_FILE); |
| 440 return RUN_ALL_TESTS(); | 440 return RUN_ALL_TESTS(); |
| 441 } | 441 } |
| OLD | NEW |