diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-10-22 07:43:30 (GMT) |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-10-22 07:43:30 (GMT) |
| commit | a6dfd3aca7f2f91f95fc7ab650c95a48420d513d (patch) | |
| tree | e910b0c998e36c67cfe9961cb31874e785983caf | |
| parent | 620659ed92829a88ee34134c782bf5b5aa5a0a0c (diff) | |
| parent | fe0ee53feb43612c1230c95d016f2b68ac865fe0 (diff) | |
| download | googletest-a6dfd3aca7f2f91f95fc7ab650c95a48420d513d.zip googletest-a6dfd3aca7f2f91f95fc7ab650c95a48420d513d.tar.gz googletest-a6dfd3aca7f2f91f95fc7ab650c95a48420d513d.tar.bz2 | |
Merge pull request #3073 from ArthurSonzogni:fix-typo
PiperOrigin-RevId: 338093064
| -rw-r--r-- | googletest/src/gtest.cc | 2 | ||||
| -rw-r--r-- | googletest/test/googletest-output-test-golden-lin.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index b5bc353..3c32da8 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -555,7 +555,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() { "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:" + "(in a non-header) in the namespace it is defined in:" "\n\n" "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + testcase.first + ");"; diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt index 9ad927d..3fab3b9 100644 --- a/googletest/test/googletest-output-test-golden-lin.txt +++ b/googletest/test/googletest-output-test-golden-lin.txt @@ -1013,7 +1013,7 @@ Type parameterized test suite DetectNotInstantiatedTypesTest is defined via REGI 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.) -To suppress this error for this test suite, insert the following line (in a non-header) in the namespace it is definedin in: +To suppress this error for this test suite, insert the following line (in a non-header) in the namespace it is defined in: GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTypesTest); Stack trace: (omitted) |