diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-24 07:29:13 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-02-24 07:29:13 +0000 |
| commit | 658ac0b71a350cc833ee4520536b6c4964c7b944 (patch) | |
| tree | aed1a53191aa46cc85100533862e9590e974f0c5 /test/gmock-internal-utils_test.cc | |
| parent | ed6c9277bb12f2808bb812ae8f91492dac9517b4 (diff) | |
| download | googletest-658ac0b71a350cc833ee4520536b6c4964c7b944.tar.gz googletest-658ac0b71a350cc833ee4520536b6c4964c7b944.tar.bz2 googletest-658ac0b71a350cc833ee4520536b6c4964c7b944.zip | |
Indents preprocessor directives.
Diffstat (limited to 'test/gmock-internal-utils_test.cc')
| -rw-r--r-- | test/gmock-internal-utils_test.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 5b0e8043..ae743c1c 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -45,7 +45,7 @@ #include "gtest/gtest-spi.h" #if GTEST_OS_CYGWIN -#include <sys/types.h> // For ssize_t. NOLINT +# include <sys/types.h> // For ssize_t. NOLINT #endif class ProtocolMessage; @@ -416,18 +416,21 @@ TEST(LogTest, NoSkippingStackFrameInOptMode) { CaptureStdout(); Log(WARNING, "Test log.\n", 100); const String log = GetCapturedStdout(); -#if defined(NDEBUG) && GTEST_GOOGLE3_MODE_ + +# if defined(NDEBUG) && GTEST_GOOGLE3_MODE_ + // In opt mode, no stack frame should be skipped. EXPECT_THAT(log, ContainsRegex("\nGMOCK WARNING:\n" "Test log\\.\n" "Stack trace:\n" ".+")); -#else +# else + // In dbg mode, the stack frames should be skipped. EXPECT_STREQ("\nGMOCK WARNING:\n" "Test log.\n" "Stack trace:\n", log.c_str()); -#endif +# endif } // Tests that all logs are printed when the value of the |