diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 15:55:20 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 15:55:20 +0000 |
| commit | 1790077f86dff2b0e9d832888fd334e8ccc455aa (patch) | |
| tree | 11dd4db73a31d0b176faac77944af4019c4042d8 /content/browser/child_process_launcher.cc | |
| parent | 68e91a7f8ded9d611ca405ba783e1393c7b171de (diff) | |
| download | chromium_src-1790077f86dff2b0e9d832888fd334e8ccc455aa.zip chromium_src-1790077f86dff2b0e9d832888fd334e8ccc455aa.tar.gz chromium_src-1790077f86dff2b0e9d832888fd334e8ccc455aa.tar.bz2 | |
Revert 261836 "Restore --child-clean-exit behavior for ASan/LSan..."
Suspected of causing red bots on Linux CrOS ASan LSan:
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%283%29/builds/702
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%282%29/builds/664
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%281%29/builds/702
> Restore --child-clean-exit behavior for ASan/LSan/MSan builds.
>
> This flag was removed in r260304, but sanitizer tools still need it. Instead
> of reintroducing the flag, we make this behavior unconditional under #ifdef
> *_SANITIZER.
>
> BUG=324216, 307043
> R=jam@chromium.org
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/226113003
TBR=earthdok@chromium.org
Review URL: https://codereview.chromium.org/226693006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/child_process_launcher.cc')
| -rw-r--r-- | content/browser/child_process_launcher.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 1495f41..3f378b42 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -59,12 +59,7 @@ class ChildProcessLauncher::Context termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), exit_code_(RESULT_CODE_NORMAL_EXIT), starting_(true), -#if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \ - defined(THREAD_SANITIZER) - terminate_child_on_shutdown_(false) -#else terminate_child_on_shutdown_(true) -#endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) , zygote_(false) #endif |