Try to fix build more after r234081 / r234112.
It looks like logging.h _always_ defines LOGGING_IS_OFFICIAL_BUILD, it's just defined to 0 or 1. So check for the value of LOGGING_IS_OFFICIAL_BUILD instead of its definedness. BUG=315884 TBR=akalin@chromium.org Review URL: https://codereview.chromium.org/66213008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234115 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
@ -17,11 +17,11 @@ using ::testing::Return;
|
||||
// Needs to be global since log assert handlers can't maintain state.
|
||||
int log_sink_call_count = 0;
|
||||
|
||||
#if !defined(LOGGING_IS_OFFICIAL_BUILD)
|
||||
#if !LOGGING_IS_OFFICIAL_BUILD
|
||||
void LogSink(const std::string& str) {
|
||||
++log_sink_call_count;
|
||||
}
|
||||
#endif // !defined(LOGGING_IS_OFFICIAL_BUILD)
|
||||
#endif // !LOGGING_IS_OFFICIAL_BUILD
|
||||
|
||||
// Class to make sure any manipulations we do to the min log level are
|
||||
// contained (i.e., do not affect other unit tests).
|
||||
@ -169,7 +169,7 @@ TEST_F(LoggingTest, LoggingIsLazy) {
|
||||
}
|
||||
|
||||
// Official builds have CHECKs directly call BreakDebugger.
|
||||
#if !defined(LOGGING_IS_OFFICIAL_BUILD)
|
||||
#if !LOGGING_IS_OFFICIAL_BUILD
|
||||
|
||||
TEST_F(LoggingTest, CheckStreamsAreLazy) {
|
||||
MockLogSource mock_log_source, uncalled_mock_log_source;
|
||||
@ -204,8 +204,7 @@ TEST_F(LoggingTest, DebugLoggingReleaseBehavior) {
|
||||
TEST_F(LoggingTest, DcheckStreamsAreLazy) {
|
||||
MockLogSource mock_log_source;
|
||||
EXPECT_CALL(mock_log_source, Log()).Times(0);
|
||||
#if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) && \
|
||||
!defined(DCHECK_ALWAYS_ON)
|
||||
#if !LOGGING_IS_OFFICIAL_BUILD && defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
|
||||
// Unofficial release build without dcheck enabled.
|
||||
set_dcheck_state(DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
|
||||
DCHECK(mock_log_source.Log()) << mock_log_source.Log();
|
||||
|
Reference in New Issue
Block a user