diff options
author | kosak <kosak@google.com> | 2015-07-17 22:11:58 +0000 |
---|---|---|
committer | kosak <kosak@google.com> | 2015-07-17 22:11:58 +0000 |
commit | 4f8dc917ebce062f75defee3d4890bbcd07e277b (patch) | |
tree | 86fe2fbf32ec7ecbf34e83dc2b0380eabb09f8ad /include/gtest/gtest-param-test.h | |
parent | 195610d30c2234b76bef70a85426ac8d7dbdf9f3 (diff) | |
download | googletest-4f8dc917ebce062f75defee3d4890bbcd07e277b.tar.gz googletest-4f8dc917ebce062f75defee3d4890bbcd07e277b.tar.bz2 googletest-4f8dc917ebce062f75defee3d4890bbcd07e277b.zip |
Add support for --gtest_flagfile.
Diffstat (limited to 'include/gtest/gtest-param-test.h')
-rw-r--r-- | include/gtest/gtest-param-test.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h index 0b61629a..9a1d8a62 100644 --- a/include/gtest/gtest-param-test.h +++ b/include/gtest/gtest-param-test.h @@ -1387,11 +1387,14 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3, static int AddToRegistry() { \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ GetTestCasePatternHolder<test_case_name>(\ - #test_case_name, __FILE__, __LINE__)->AddTestPattern(\ - #test_case_name, \ - #test_name, \ - new ::testing::internal::TestMetaFactory< \ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \ + #test_case_name, \ + ::testing::internal::CodeLocation(\ + __FILE__, __LINE__))->AddTestPattern(\ + #test_case_name, \ + #test_name, \ + new ::testing::internal::TestMetaFactory< \ + GTEST_TEST_CLASS_NAME_(\ + test_case_name, test_name)>()); \ return 0; \ } \ static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \ @@ -1409,10 +1412,12 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3, int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ GetTestCasePatternHolder<test_case_name>(\ - #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\ - #prefix, \ - >est_##prefix##test_case_name##_EvalGenerator_, \ - __FILE__, __LINE__) + #test_case_name, \ + ::testing::internal::CodeLocation(\ + __FILE__, __LINE__))->AddTestCaseInstantiation(\ + #prefix, \ + >est_##prefix##test_case_name##_EvalGenerator_, \ + __FILE__, __LINE__) } // namespace testing |