diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 8 | ||||
| -rw-r--r-- | base/base.isolate | 2 | ||||
| -rw-r--r-- | base/debug/debugger_unittest.cc | 3 | ||||
| -rw-r--r-- | base/debug/stack_trace_unittest.cc | 6 | ||||
| -rw-r--r-- | base/process/process_util_unittest.cc | 3 |
5 files changed, 13 insertions, 9 deletions
diff --git a/base/base.gyp b/base/base.gyp index d2550ec..43eda5a 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -188,6 +188,14 @@ }, }, }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/', + 'files': [ + '../build/win/dbghelp_xp/dbghelp.dll', + ], + }, + ], }], ['OS == "mac" or (OS == "ios" and _toolset == "host")', { 'link_settings': { diff --git a/base/base.isolate b/base/base.isolate index f67f45f..e101771 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -34,7 +34,7 @@ # Required for base/stack_trace_win.cc to symbolize correctly. 'variables': { 'files': [ - '../build/win/dbghelp_xp/dbghelp.dll', + '<(PRODUCT_DIR)/dbghelp.dll', ], }, }], diff --git a/base/debug/debugger_unittest.cc b/base/debug/debugger_unittest.cc index 75c3daf..0a5a039 100644 --- a/base/debug/debugger_unittest.cc +++ b/base/debug/debugger_unittest.cc @@ -31,8 +31,7 @@ TEST(Debugger, CrashAtBreakpoint) { } #if defined(OS_WIN) -// TODO(scottmg): http://crbug.com/461160 -TEST(Debugger, DISABLED_DoesntExecuteBeyondBreakpoint) { +TEST(Debugger, DoesntExecuteBeyondBreakpoint) { EXPECT_EXIT(CrashWithBreakDebugger(), ::testing::ExitedWithCode(0x80000003), ""); } diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc index 32b4e68..15c9093 100644 --- a/base/debug/stack_trace_unittest.cc +++ b/base/debug/stack_trace_unittest.cc @@ -120,8 +120,7 @@ TEST_F(StackTraceTest, MAYBE_OutputToStream) { } // The test is used for manual testing, e.g., to see the raw output. -// TODO(scottmg): http://crbug.com/461160 -TEST_F(StackTraceTest, DISABLED_DebugOutputToStream) { +TEST_F(StackTraceTest, DebugOutputToStream) { StackTrace trace; std::ostringstream os; trace.OutputToStream(&os); @@ -129,8 +128,7 @@ TEST_F(StackTraceTest, DISABLED_DebugOutputToStream) { } // The test is used for manual testing, e.g., to see the raw output. -// TODO(scottmg): http://crbug.com/461160 -TEST_F(StackTraceTest, DISABLED_DebugPrintBacktrace) { +TEST_F(StackTraceTest, DebugPrintBacktrace) { StackTrace().Print(); } #endif // !defined(__UCLIBC__) diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc index 88f1632..11d8874 100644 --- a/base/process/process_util_unittest.cc +++ b/base/process/process_util_unittest.cc @@ -240,8 +240,7 @@ MULTIPROCESS_TEST_MAIN(CrashingChildProcess) { #else #define MAYBE_GetTerminationStatusCrash GetTerminationStatusCrash #endif -// TODO(scottmg): http://crbug.com/461160 -TEST_F(ProcessUtilTest, DISABLED_GetTerminationStatusCrash) { +TEST_F(ProcessUtilTest, MAYBE_GetTerminationStatusCrash) { const std::string signal_file = ProcessUtilTest::GetSignalFilePath(kSignalFileCrash); remove(signal_file.c_str()); |