diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-24 16:17:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 00:18:13 +0000 |
| commit | f063a7eb8a746bc2479509664d26e193e35b6957 (patch) | |
| tree | 8c42d9dd4b576621e8fcc367e59305fdb3bae7b6 /base/process | |
| parent | a5ed06ce43f57f7d4243dae407e16937a2a4e00f (diff) | |
| download | chromium_src-f063a7eb8a746bc2479509664d26e193e35b6957.zip chromium_src-f063a7eb8a746bc2479509664d26e193e35b6957.tar.gz chromium_src-f063a7eb8a746bc2479509664d26e193e35b6957.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
Committed: https://crrev.com/09acc50cfadc6aa38db23ddadec134410ec968c0
Cr-Commit-Position: refs/heads/master@{#317868}
Review URL: https://codereview.chromium.org/951083003
Cr-Commit-Position: refs/heads/master@{#317926}
Diffstat (limited to 'base/process')
| -rw-r--r-- | base/process/process_util_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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()); |