diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-19 21:50:45 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-19 21:50:45 +0000 |
| commit | de011a432c19b67c65230fc3d453093e7b403069 (patch) | |
| tree | 1e1f5ae5530c54691c7c485869fda2ca5c42473b /test | |
| parent | 6c9ae8ed3fb146961974a0a81e57e0baeafde9f7 (diff) | |
| download | googletest-de011a432c19b67c65230fc3d453093e7b403069.tar.gz | |
GTEST_USE_OWN_FLAGFILE support
git-svn-id: http://googletest.googlecode.com/svn/trunk@729 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 88130df..dd7f19f 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -6399,6 +6399,7 @@ TEST_F(InitGoogleTestTest, WideStrings) { } # endif // GTEST_OS_WINDOWS +#if GTEST_USE_OWN_FLAGFILE_FLAG_ class FlagfileTest : public InitGoogleTestTest { public: virtual void SetUp() { @@ -6497,6 +6498,7 @@ TEST_F(FlagfileTest, SeveralFlags) { GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false); } +#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ // Tests current_test_info() in UnitTest. class CurrentTestInfoTest : public Test { |