diff options
| author | Bernhard Bauer <bauerb@chromium.org> | 2018-03-12 13:51:04 (GMT) |
|---|---|---|
| committer | Bernhard Bauer <bauerb@chromium.org> | 2018-03-12 18:14:06 (GMT) |
| commit | 7b70413e0ca57b3e48d7655f342122f159f52b31 (patch) | |
| tree | e9339fcd1ff6deb4e9b5f76b11012a4941984ddd /googletest/include/gtest/internal/gtest-internal.h | |
| parent | 7a2563a514563145d82f02b5b350cba1af33af67 (diff) | |
| download | googletest-7b70413e0ca57b3e48d7655f342122f159f52b31.zip googletest-7b70413e0ca57b3e48d7655f342122f159f52b31.tar.gz googletest-7b70413e0ca57b3e48d7655f342122f159f52b31.tar.bz2 | |
Allow macros inside of parametrized test names.
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.
Upstream of cr/188748737.
Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
Diffstat (limited to 'googletest/include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 843058f..8d6a461 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -75,6 +75,9 @@ #define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar) #define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar +// Stringifies its argument. +#define GTEST_STRINGIFY_(name) #name + class ProtocolMessage; namespace proto2 { class Message; } |