AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Adds more checks before deleting temporary files.

Browse Source
This commit is contained in:
Feng Xiao 2014-11-07 14:09:18 -05:00
parent ad7f41bd57
commit baca1a8a1a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/protobuf/compiler/command_line_interface_unittest.cc
View File

@ -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++) {

4
src/google/protobuf/compiler/importer_unittest.cc
View File

@ -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);
}
}
}

2
src/google/protobuf/testing/file.cc
View File

@ -133,6 +133,8 @@ bool File::RecursivelyCreateDir(const string& path, int mode) {
void File::DeleteRecursively(const string& name,
void* dummy1, void* dummy2) {
if (name.empty()) return;
// We don't care too much about error checking here since this is only used
// in tests to delete temporary directories that are under /tmp anyway.