diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 20:20:36 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 20:20:36 +0000 |
| commit | 2a46e14ef064c6556f077cf214759adc4b235f04 (patch) | |
| tree | a1aa3bdf7387163177af7fbd2cfa268990f6a030 | |
| parent | 6e9e6e38d2de844339cb8b8bcf6afb74855c7645 (diff) | |
| download | chromium_src-2a46e14ef064c6556f077cf214759adc4b235f04.zip chromium_src-2a46e14ef064c6556f077cf214759adc4b235f04.tar.gz chromium_src-2a46e14ef064c6556f077cf214759adc4b235f04.tar.bz2 | |
Revert r142693 "Suppress the "Assertion Failed" dialog of VC++."
This change suppresses assertion-failure dialogs of VC++ and outputs assertion messages to stderr on Windows.
This broke windows tsan and drmemory bot
TBR=hbono@chromium.org
BUG=132037,133313
TEST=drmemroy and windows tsan bot cycles green
Review URL: https://chromiumcodereview.appspot.com/10580002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142796 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/test/test_suite.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc index 87ee904..83a2549 100644 --- a/base/test/test_suite.cc +++ b/base/test/test_suite.cc @@ -232,12 +232,6 @@ void TestSuite::SuppressErrorDialogs() { // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx UINT existing_flags = SetErrorMode(new_flags); SetErrorMode(existing_flags | new_flags); - - // Suppress the "Debug Assertion Failed" dialog. - // TODO(hbono): remove this code when gtest has it. - // http://groups.google.com/d/topic/googletestframework/OjuwNlXy5ac/discussion - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG); - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); #endif // defined(OS_WIN) } |