diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-24 12:18:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-24 20:19:38 +0000 |
| commit | 09acc50cfadc6aa38db23ddadec134410ec968c0 (patch) | |
| tree | 18be358143a6f4b4fd94f06e09bc1c5b37152131 /base/debug | |
| parent | 7d83b45b1d4e60487b64f3f4493872253ad914d5 (diff) | |
| download | chromium_src-09acc50cfadc6aa38db23ddadec134410ec968c0.zip chromium_src-09acc50cfadc6aa38db23ddadec134410ec968c0.tar.gz chromium_src-09acc50cfadc6aa38db23ddadec134410ec968c0.tar.bz2 | |
xp: copy dbghelp.dll to output dir and have base.isolate use it there
Previous CL https://codereview.chromium.org/943933005 didn't work properly
because the dll wasn't in the same directory as the binary, so it was still
loading the system dbghelp.dll. See details in 460506.
Copies dbghelp.dll to the output dir, and has the isolate file point at that.
Re-enable tests that were failing due to dbghelp hanging.
XP test run here: https://chromium-swarm.appspot.com/user/task/25d5bc17b6dddc10
BUG=460506, 461160
Review URL: https://codereview.chromium.org/951083003
Cr-Commit-Position: refs/heads/master@{#317868}
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/debugger_unittest.cc | 3 | ||||
| -rw-r--r-- | base/debug/stack_trace_unittest.cc | 6 |
2 files changed, 3 insertions, 6 deletions
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__) |