Chromium Code Reviews| Index: base/logging_unittest.cc |
| =================================================================== |
| --- base/logging_unittest.cc (revision 97912) |
| +++ base/logging_unittest.cc (working copy) |
| @@ -197,16 +197,17 @@ |
| 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 // !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) && \ |
|
rvargas (doing something else)
2011/08/24 00:49:37
nit: personally, I'd remove this comment.
|
| + // !defined(DCHECK_ALWAYS_ON) |
| } |
| TEST_F(LoggingTest, Dcheck) { |