Reviewers: sigurds,
Description:
Revert r23962 "Configure d8 & cctest to suppress Windows error dialogs."
Breaks compilation on Windows
[email protected]
BUG=none
LOG=n
Please review this at https://codereview.chromium.org/572873004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+0, -33 lines):
M src/d8.cc
M test/cctest/cctest.cc
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
8a155ebd91d2fa929fd7924279e0aaa478bce754..f22be5bb5d184125dc0c7c6410d698029113d26b
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -54,8 +54,6 @@
#if !defined(_WIN32) && !defined(_WIN64)
#include <unistd.h> // NOLINT
-#else
-#include <windows.h> // 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();
Index: test/cctest/cctest.cc
diff --git a/test/cctest/cctest.cc b/test/cctest/cctest.cc
index
6fb831a681a8c054543514456c668bc4048cdc70..2bb08b0ec946ff517371054ef656a56ff6ab6ea3
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 <windows.h> // 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);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
