summaryrefslogtreecommitdiffstats
path: root/base/logging_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 06:01:23 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 06:01:23 +0000
commit84ddfcf4b2f4d7533afa5d431083ad828c159c32 (patch)
treee74fdd95939b1be4b3e351c7991bf80e55fcdb4d /base/logging_unittest.cc
parent0b805d5cc4e6ff13d1aad305476b70cbd7225463 (diff)
downloadchromium_src-84ddfcf4b2f4d7533afa5d431083ad828c159c32.zip
chromium_src-84ddfcf4b2f4d7533afa5d431083ad828c159c32.tar.gz
chromium_src-84ddfcf4b2f4d7533afa5d431083ad828c159c32.tar.bz2
Fix official build breakage introduced by 112649
BUG=107753 TEST= Review URL: http://codereview.chromium.org/8968008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging_unittest.cc')
-rw-r--r--base/logging_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc
index c434129..760cc24 100644
--- a/base/logging_unittest.cc
+++ b/base/logging_unittest.cc
@@ -166,6 +166,9 @@ TEST_F(LoggingTest, LoggingIsLazy) {
DVLOG_IF(1, true) << mock_log_source.Log();
}
+// Official builds have CHECKs directly call BreakDebugger.
+#if !defined(LOGGING_IS_OFFICIAL_BUILD)
+
TEST_F(LoggingTest, CheckStreamsAreLazy) {
MockLogSource mock_log_source, uncalled_mock_log_source;
EXPECT_CALL(mock_log_source, Log()).Times(8).
@@ -182,6 +185,8 @@ TEST_F(LoggingTest, CheckStreamsAreLazy) {
<< mock_log_source.Log();
}
+#endif
+
TEST_F(LoggingTest, DebugLoggingReleaseBehavior) {
#if !defined(NDEBUG)
int debug_only_variable = 1;