summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-01-27 13:26:12 (GMT)
committerGennadiy Rozental <rogeeff@google.com>2020-01-31 00:23:10 (GMT)
commit4b666abf84733e71c5f8da4334c669ba60db42ea (patch)
tree30631c2d981858b7a459e3f55e334f22bf4fc12a
parent1a19882975345d65a8396a1e3cc75e11a30c50a2 (diff)
downloadgoogletest-4b666abf84733e71c5f8da4334c669ba60db42ea.zip
googletest-4b666abf84733e71c5f8da4334c669ba60db42ea.tar.gz
googletest-4b666abf84733e71c5f8da4334c669ba60db42ea.tar.bz2
Export Test - Do Not Merge
Adds missing `#define` guard around `TEST_F(...)` PiperOrigin-RevId: 291703056
-rw-r--r--googletest/include/gtest/gtest.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 464b316..981dbd7 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -2364,9 +2364,11 @@ constexpr bool StaticAssertTypeEq() noexcept {
// }
//
// GOOGLETEST_CM0011 DO NOT DELETE
+#if !GTEST_DONT_DEFINE_TEST
#define TEST_F(test_fixture, test_name)\
GTEST_TEST_(test_fixture, test_name, test_fixture, \
::testing::internal::GetTypeId<test_fixture>())
+#endif // !GTEST_DONT_DEFINE_TEST
// Returns a path to temporary directory.
// Tries to determine an appropriate directory for the platform.