Add a gyp flag to enable dcheck by default in release without
having the pass a flag. This will be used on the try bots.
BUG=96753
Review URL: http://codereview.chromium.org/7719007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102017 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 20960e074cf789825155f771e1c035df41cd0e75
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc
index 5a2cb53..08d7830 100644
--- a/base/logging_unittest.cc
+++ b/base/logging_unittest.cc
@@ -197,16 +197,16 @@
TEST_F(LoggingTest, DcheckStreamsAreLazy) {
MockLogSource mock_log_source;
EXPECT_CALL(mock_log_source, Log()).Times(0);
-
-#if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG)
- // Unofficial release build.
+#if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) && \
+ !defined(DCHECK_ALWAYS_ON)
+ // Unofficial release build without dcheck enabled.
g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
DCHECK(mock_log_source.Log()) << mock_log_source.Log();
DPCHECK(mock_log_source.Log()) << mock_log_source.Log();
DCHECK_EQ(0, 0) << mock_log_source.Log();
DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL))
<< mock_log_source.Log();
-#endif // !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG)
+#endif
}
TEST_F(LoggingTest, Dcheck) {
@@ -214,12 +214,18 @@
// Official build.
EXPECT_FALSE(DCHECK_IS_ON());
EXPECT_FALSE(DLOG_IS_ON(DCHECK));
-#elif defined(NDEBUG)
+#elif defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
// Unofficial release build.
g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
SetLogReportHandler(&LogSink);
EXPECT_TRUE(DCHECK_IS_ON());
EXPECT_FALSE(DLOG_IS_ON(DCHECK));
+#elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
+ // Unofficial release build with real DCHECKS.
+ g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+ SetLogAssertHandler(&LogSink);
+ EXPECT_TRUE(DCHECK_IS_ON());
+ EXPECT_FALSE(DLOG_IS_ON(DCHECK));
#else
// Unofficial debug build.
SetLogAssertHandler(&LogSink);