diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-17 13:07:51 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-17 13:07:51 -0400 |
| commit | 2995ca563d76811be04ff23d554012415ac16915 (patch) | |
| tree | bcc055d6c20b0387cd33ef15ee80388f01e494e1 /googletest/test | |
| parent | bdc29d5dc19dd802907ea37a80ce5dc9afe0898d (diff) | |
| parent | 3cddd56e195b516f449bea6dcd3edd4494195631 (diff) | |
| download | googletest-2995ca563d76811be04ff23d554012415ac16915.tar.gz googletest-2995ca563d76811be04ff23d554012415ac16915.tar.bz2 googletest-2995ca563d76811be04ff23d554012415ac16915.zip | |
Merge pull request #2507 from roblub:master
PiperOrigin-RevId: 275076905
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 8312bd10..d17a1554 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6170,7 +6170,7 @@ TEST_F(ParseFlagsTest, WideStrings) { #if GTEST_USE_OWN_FLAGFILE_FLAG_ class FlagfileTest : public ParseFlagsTest { public: - virtual void SetUp() { + void SetUp() override { ParseFlagsTest::SetUp(); testdata_path_.Set(internal::FilePath( @@ -6180,7 +6180,7 @@ class FlagfileTest : public ParseFlagsTest { EXPECT_TRUE(testdata_path_.CreateFolder()); } - virtual void TearDown() { + void TearDown() override { testing::internal::posix::RmDir(testdata_path_.c_str()); ParseFlagsTest::TearDown(); } |