diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-04 19:38:35 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-09-04 19:38:35 +0200 |
| commit | aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f (patch) | |
| tree | 6eb4fe206c161c0cefb998cec4bcd4a4033408ae /googletest/samples | |
| parent | 7c6353d29a147cad1c904bf2957fd4ca2befe135 (diff) | |
| download | googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.gz googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.bz2 googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.zip | |
remove GTEST_HAS_PARAM_TESTS
As mentioned in issue #360:
"Now that all the platforms gtest supports work with value-parameterized
tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from
the codebase everywhere."
https://github.com/google/googletest/issues/360
Diffstat (limited to 'googletest/samples')
| -rw-r--r-- | googletest/samples/sample7_unittest.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/googletest/samples/sample7_unittest.cc b/googletest/samples/sample7_unittest.cc index b59e1d96..efa97289 100644 --- a/googletest/samples/sample7_unittest.cc +++ b/googletest/samples/sample7_unittest.cc @@ -40,7 +40,6 @@ #include "gtest/gtest.h" namespace { -#if GTEST_HAS_PARAM_TEST using ::testing::TestWithParam; using ::testing::Values; @@ -116,15 +115,4 @@ INSTANTIATE_TEST_CASE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7, Values(&CreateOnTheFlyPrimeTable, &CreatePreCalculatedPrimeTable<1000>)); -#else - -// Google Test may not support value-parameterized tests with some -// compilers. If we use conditional compilation to compile out all -// code referring to the gtest_main library, MSVC linker will not link -// that library at all and consequently complain about missing entry -// point defined in that library (fatal error LNK1561: entry point -// must be defined). This dummy test keeps gtest_main linked in. -TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {} - -#endif // GTEST_HAS_PARAM_TEST } // namespace |