diff options
author | Feng Xiao <xiaofeng@xiaofeng-macbookpro2.roam.corp.google.com> | 2014-11-07 14:09:18 -0500 |
---|---|---|
committer | Feng Xiao <xiaofeng@xiaofeng-macbookpro2.roam.corp.google.com> | 2014-11-08 02:40:18 -0500 |
commit | baca1a8a1aa180c42de6278d3b8286c4496c6a10 (patch) | |
tree | 5c5375f6832f92054c4a8fcbc39be0ddea93eac8 /src/google/protobuf/compiler | |
parent | ad7f41bd574108e96c87510701e7653b78bd2729 (diff) | |
download | protobuf-baca1a8a1aa180c42de6278d3b8286c4496c6a10.tar.gz protobuf-baca1a8a1aa180c42de6278d3b8286c4496c6a10.tar.bz2 protobuf-baca1a8a1aa180c42de6278d3b8286c4496c6a10.zip |
Adds more checks before deleting temporary files.
Diffstat (limited to 'src/google/protobuf/compiler')
-rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 4 | ||||
-rw-r--r-- | src/google/protobuf/compiler/importer_unittest.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 6bf7357b..5bc1fea9 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -252,7 +252,9 @@ void CommandLineInterfaceTest::SetUp() { void CommandLineInterfaceTest::TearDown() { // Delete the temp directory. - File::DeleteRecursively(temp_directory_, NULL, NULL); + if (File::Exists(temp_directory_)) { + File::DeleteRecursively(temp_directory_, NULL, NULL); + } // Delete all the MockCodeGenerators. for (int i = 0; i < mock_generators_to_delete_.size(); i++) { diff --git a/src/google/protobuf/compiler/importer_unittest.cc b/src/google/protobuf/compiler/importer_unittest.cc index 387f135d..8cc5d882 100644 --- a/src/google/protobuf/compiler/importer_unittest.cc +++ b/src/google/protobuf/compiler/importer_unittest.cc @@ -348,7 +348,9 @@ class DiskSourceTreeTest : public testing::Test { virtual void TearDown() { for (int i = 0; i < dirnames_.size(); i++) { - File::DeleteRecursively(dirnames_[i], NULL, NULL); + if (File::Exists(dirnames_[i])) { + File::DeleteRecursively(dirnames_[i], NULL, NULL); + } } } |