summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2015-07-19 21:50:45 (GMT)
committerkosak <kosak@google.com>2015-07-19 21:50:45 (GMT)
commit4d69b1607a876a77b8719f035b23254677617a47 (patch)
tree1e1f5ae5530c54691c7c485869fda2ca5c42473b /test
parente7dbfde8ce49c5989d6e44715cfc1910a95990fe (diff)
downloadgoogletest-4d69b1607a876a77b8719f035b23254677617a47.zip
googletest-4d69b1607a876a77b8719f035b23254677617a47.tar.gz
googletest-4d69b1607a876a77b8719f035b23254677617a47.tar.bz2
GTEST_USE_OWN_FLAGFILE support
Diffstat (limited to 'test')
-rw-r--r--test/gtest_unittest.cc2
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 {