diff options
| author | Shahbaz Youssefi <syoussefi@google.com> | 2019-12-10 10:01:25 -0500 |
|---|---|---|
| committer | Shahbaz Youssefi <syoussefi@chromium.org> | 2019-12-16 13:01:59 -0500 |
| commit | 1800a38fb7d8d4f923fc450875afa3bc16f01151 (patch) | |
| tree | 944119bf036d3169cc2cbfa0c01930d0ee75f362 /googletest/test | |
| parent | 4b7809c2f5236b16a2e3b45e2b5ade48fb6a3c0c (diff) | |
| download | googletest-1800a38fb7d8d4f923fc450875afa3bc16f01151.tar.gz googletest-1800a38fb7d8d4f923fc450875afa3bc16f01151.tar.bz2 googletest-1800a38fb7d8d4f923fc450875afa3bc16f01151.zip | |
Revert "Googletest export": disallow empty prefix
This reverts commit 20b5b8ecc7a81d23b4716e22a2b35fd53379c8c6.
Reason for revert: Breaks existing applications, such as ANGLE
(angleproject.org), requires adding an extra prefix that needs to be
typed for no reason (when testing from command line) and increases the
logs' sizes by a non-trivial amount due to the very large number of
tests ANGLE runs.
Original commit message:
Add a compile time check to ensure that the parameters to TEST_P and
INSTANTIATE_TEST_SUITE_P are not empty. Some compilers already fail
in that case and, even where it works, it's likely to result in
technically invalid code by virtue of creating reserved identifiers:
https://en.cppreference.com/w/cpp/language/identifiers
First, every project is perfectly capable of adding a prefix if they
want to support such a compiler. This change penalizes every
project.
Second, using a prefix such as `_p` also results in reserved
identifiers, so this change is not really solving the problem. For that
matter, instead of generating `gtest_##prefix##...`, you can generate
`gtest_x##prefix##...` to correctly fix the issue, including when empty
prefixes are used.
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-output-test-golden-lin.txt | 6 | ||||
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt index a4cade31..a08140e1 100644 --- a/googletest/test/googletest-output-test-golden-lin.txt +++ b/googletest/test/googletest-output-test-golden-lin.txt @@ -966,9 +966,9 @@ Expected equality of these values: Stack trace: (omitted) [0;31m[ FAILED ] [mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 -[0;32m[----------] [m1 test from All/EmptyBasenameParamInst -[0;32m[ RUN ] [mAll/EmptyBasenameParamInst.Passes/0 -[0;32m[ OK ] [mAll/EmptyBasenameParamInst.Passes/0 +[0;32m[----------] [m1 test from EmptyBasenameParamInst +[0;32m[ RUN ] [mEmptyBasenameParamInst.Passes/0 +[0;32m[ OK ] [mEmptyBasenameParamInst.Passes/0 [0;32m[----------] [m2 tests from PrintingStrings/ParamTest [0;32m[ RUN ] [mPrintingStrings/ParamTest.Success/a [0;32m[ OK ] [mPrintingStrings/ParamTest.Success/a diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index 59b2c89b..1c7943c3 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -102,7 +102,7 @@ class EmptyBasenameParamInst : public testing::TestWithParam<int> {}; TEST_P(EmptyBasenameParamInst, Passes) { EXPECT_EQ(1, GetParam()); } -INSTANTIATE_TEST_SUITE_P(All, EmptyBasenameParamInst, testing::Values(1)); +INSTANTIATE_TEST_SUITE_P(, EmptyBasenameParamInst, testing::Values(1)); static const char kGoldenString[] = "\"Line\0 1\"\nLine 2"; diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 7acc2280..83df6a71 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -5349,7 +5349,7 @@ TEST_P(CodeLocationForTESTP, Verify) { VERIFY_CODE_LOCATION; } -INSTANTIATE_TEST_SUITE_P(All, CodeLocationForTESTP, Values(0)); +INSTANTIATE_TEST_SUITE_P(, CodeLocationForTESTP, Values(0)); template <typename T> class CodeLocationForTYPEDTEST : public Test { |