summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/webkit_support.cc3
-rw-r--r--webkit/tools/test_shell/test_shell.cc10
2 files changed, 8 insertions, 5 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index e9eed2e..52a2a34 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -93,7 +93,8 @@ void InitLogging(bool enable_gp_fault_error_box) {
logging::LOG_ONLY_TO_FILE,
// We might have multiple DumpRenderTree processes going at once.
logging::LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE);
+ logging::DELETE_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
// We want process and thread IDs because we may have multiple processes.
const bool kProcessId = true;
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index ce83655..a1a6927 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -417,10 +417,12 @@ void TestShell::InitLogging(bool suppress_error_dialogs,
FilePath log_filename;
PathService::Get(base::DIR_EXE, &log_filename);
log_filename = log_filename.AppendASCII("test_shell.log");
- logging::InitLogging(log_filename.value().c_str(),
- destination,
- logging::LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE);
+ logging::InitLogging(
+ log_filename.value().c_str(),
+ destination,
+ logging::LOCK_LOG_FILE,
+ logging::DELETE_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
// we want process and thread IDs because we may have multiple processes
logging::SetLogItems(true, true, false, true);