diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-24 14:23:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-24 22:24:30 +0000 |
| commit | 9b8a0877ef9a56c31dfd37cc4c335dfd39d51e96 (patch) | |
| tree | ee2b188da56335b779acd7bb73a07a9d6cf18107 /base/process | |
| parent | f9fdda033eb8ccb8ce18649c8aaeb28175ad0e6a (diff) | |
| download | chromium_src-9b8a0877ef9a56c31dfd37cc4c335dfd39d51e96.zip chromium_src-9b8a0877ef9a56c31dfd37cc4c335dfd39d51e96.tar.gz chromium_src-9b8a0877ef9a56c31dfd37cc4c335dfd39d51e96.tar.bz2 | |
Revert of xp: copy dbghelp.dll to output dir and have base.isolate use it there (patchset #6 id:100001 of https://codereview.chromium.org/951083003/)
Reason for revert:
some blink waterfall failing for reasons unclear. dependency on base.isolate without depending on base maybe?
Original issue's description:
> 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}
TBR=cpu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=460506, 461160
Review URL: https://codereview.chromium.org/954003002
Cr-Commit-Position: refs/heads/master@{#317900}
Diffstat (limited to 'base/process')
| -rw-r--r-- | base/process/process_util_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc index 11d8874..88f1632 100644 --- a/base/process/process_util_unittest.cc +++ b/base/process/process_util_unittest.cc @@ -240,7 +240,8 @@ MULTIPROCESS_TEST_MAIN(CrashingChildProcess) { #else #define MAYBE_GetTerminationStatusCrash GetTerminationStatusCrash #endif -TEST_F(ProcessUtilTest, MAYBE_GetTerminationStatusCrash) { +// TODO(scottmg): http://crbug.com/461160 +TEST_F(ProcessUtilTest, DISABLED_GetTerminationStatusCrash) { const std::string signal_file = ProcessUtilTest::GetSignalFilePath(kSignalFileCrash); remove(signal_file.c_str()); |