From 426ec8486192df6bd36850cb1359ceb9b75376cd Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Tue, 16 Sep 2014 09:14:11 +0000 Subject: [PATCH] Revert r23962 "Configure d8 & cctest to suppress Windows error dialogs." Breaks compilation on Windows TBR=sigurds@chromium.org BUG=none LOG=n Review URL: https://codereview.chromium.org/572873004 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23963 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/d8.cc | 15 --------------- test/cctest/cctest.cc | 18 ------------------ 2 files changed, 33 deletions(-) diff --git a/src/d8.cc b/src/d8.cc index 8a155eb..f22be5b 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -54,8 +54,6 @@ #if !defined(_WIN32) && !defined(_WIN64) #include // NOLINT -#else -#include // NOLINT #endif #ifndef DCHECK @@ -1597,19 +1595,6 @@ class StartupDataHandler { int Shell::Main(int argc, char* argv[]) { -#if (defined(_WIN32) || defined(_WIN64)) - UINT new_flags = - SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX; - UINT existing_flags = SetErrorMode(new_flags); - SetErrorMode(existing_flags | new_flags); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _set_error_mode(_OUT_TO_STDERR); -#endif if (!SetOptions(argc, argv)) return 1; v8::V8::InitializeICU(options.icu_data_file); v8::Platform* platform = v8::platform::CreateDefaultPlatform(); diff --git a/test/cctest/cctest.cc b/test/cctest/cctest.cc index 6fb831a..2bb08b0 100644 --- a/test/cctest/cctest.cc +++ b/test/cctest/cctest.cc @@ -34,10 +34,6 @@ #include "test/cctest/profiler-extension.h" #include "test/cctest/trace-extension.h" -#if (defined(_WIN32) || defined(_WIN64)) -#include // NOLINT -#endif - enum InitializationState {kUnset, kUnintialized, kInitialized}; static InitializationState initialization_state_ = kUnset; static bool disable_automatic_dispose_ = false; @@ -142,20 +138,6 @@ static void SuggestTestHarness(int tests) { int main(int argc, char* argv[]) { -#if (defined(_WIN32) || defined(_WIN64)) - UINT new_flags = - SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX; - UINT existing_flags = SetErrorMode(new_flags); - SetErrorMode(existing_flags | new_flags); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _set_error_mode(_OUT_TO_STDERR); -#endif - v8::V8::InitializeICU(); v8::Platform* platform = v8::platform::CreateDefaultPlatform(); v8::V8::InitializePlatform(platform); -- 2.7.4