base/logging_unittest.cc - Issue 6099012: Revert 70920 - Made logging not look up --enable-dcheck from command line...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/logging_unittest.cc

Issue 6099012: Revert 70920 - Made logging not look up --enable-dcheck from command line... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: base/logging_unittest.cc

===================================================================

--- base/logging_unittest.cc (revision 70922)

+++ base/logging_unittest.cc (working copy)

@@ -197,7 +197,7 @@

#if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG)

// Unofficial release build.

- g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;

+ logging::g_enable_dcheck = false;

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();

@@ -213,13 +213,13 @@

EXPECT_FALSE(DLOG_IS_ON(DCHECK));

#elif defined(NDEBUG)

// Unofficial release build.

- g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;

- SetLogReportHandler(&LogSink);

+ logging::g_enable_dcheck = true;

+ logging::SetLogReportHandler(&LogSink);

EXPECT_TRUE(DCHECK_IS_ON());

EXPECT_FALSE(DLOG_IS_ON(DCHECK));

#else

// Unofficial debug build.

- SetLogAssertHandler(&LogSink);

+ logging::SetLogAssertHandler(&LogSink);

EXPECT_TRUE(DCHECK_IS_ON());

EXPECT_TRUE(DLOG_IS_ON(DCHECK));

#endif // defined(LOGGING_IS_OFFICIAL_BUILD)

« no previous file with comments | « base/logging.cc ('k') | base/test/test_suite.cc » ('j') | no next file with comments »