aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-01-14 14:56:23 -0500
committervslashg <gfalcon@google.com>2020-01-16 13:56:04 -0500
commit3e79d366e380ec85b7de9409211b184bc8529655 (patch)
treefaab3a533deda76d3795cbf4702744abfba07111 /googletest/src
parent7a8591e6e4e206b748feb052f620c45278e686d0 (diff)
downloadgoogletest-3e79d366e380ec85b7de9409211b184bc8529655.tar.gz
googletest-3e79d366e380ec85b7de9409211b184bc8529655.tar.bz2
googletest-3e79d366e380ec85b7de9409211b184bc8529655.zip
Googletest export
Wire up things to support marking a type paramaterized test as allowed to be un-instantiated. PiperOrigin-RevId: 289699939
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 1abc664f..8e68c04e 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -515,8 +515,10 @@ void TypeParameterizedTestSuiteRegistry::RegisterInstantiation(
}
void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
+ const auto& ignored = *GetIgnoredParameterizedTestSuites();
for (const auto& testcase : suites_) {
if (testcase.second.instantiated) continue;
+ if (ignored.find(testcase.first) != ignored.end()) continue;
std::string message =
"Type paramaterized test suite " + testcase.first +
@@ -526,7 +528,12 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
"Ideally, TYPED_TEST_P definitions should only ever be included as "
"part of binaries that intend to use them. (As opposed to, for "
"example, being placed in a library that may be linked in to get other "
- "utilities.)";
+ "utilities.)"
+ "\n\n"
+ "To suppress this error for this test suite, insert the following line "
+ "(in a non-header) in the namespace it is definedin in:"
+ "\n\n"
+ "GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(" + testcase.first + ");";
std::string full_name =
"UninstantiatedTypeParamaterizedTestSuite<" + testcase.first + ">";