[gcc r12-8555] libstdc++: Properly remove temporary directories in filesystem tests
Jonathan Wakely
redi@gcc.gnu.org
Thu Jul 7 20:34:26 GMT 2022
https://gcc.gnu.org/g:e3b4dcfb58592b5c7335348ed883028f943cb66d
commit r12-8555-ge3b4dcfb58592b5c7335348ed883028f943cb66d
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Jun 23 14:25:49 2022 +0100
libstdc++: Properly remove temporary directories in filesystem tests
Although these tests use filesystem::remove_all to clean up, that fails
because it uses recursive_directory_iterator which is intentionally
bodged by the custom readdir defined in the test.
Just use POSIX rmdir to clean up. We don't need to use _rmdir or _wrmdir
for Windows, because we'll never reach test02() on targets where the
custom readdir doesn't interpose the one from libc.
libstdc++-v3/ChangeLog:
* testsuite/27_io/filesystem/iterators/error_reporting.cc: Use
rmdir to remove directories.
* testsuite/experimental/filesystem/iterators/error_reporting.cc:
Likewise.
(cherry picked from commit 7c1c7e120cca183671b11ba68a6350c8800823c0)
Diff:
---
.../testsuite/27_io/filesystem/iterators/error_reporting.cc | 9 +++++++--
.../experimental/filesystem/iterators/error_reporting.cc | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc
index 1c8ea4c9249..a26b29f0974 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc
@@ -107,7 +107,7 @@ void
test02()
{
namespace fs = std::filesystem;
- auto dir = __gnu_test::nonexistent_path();
+ const auto dir = __gnu_test::nonexistent_path();
fs::create_directories(dir/"subdir");
std::error_code ec;
@@ -137,7 +137,12 @@ test02()
}
#endif
- fs::remove_all(dir, ec);
+ // Cannot use fs::remove_all here because that uses
+ // recursive_directory_iterator which would use the fake readdir above.
+#ifndef _GLIBCXX_FILESYSTEM_IS_WINDOWS
+ ::rmdir((dir/"subdir").c_str());
+ ::rmdir(dir.c_str());
+#endif
}
int
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc
index 806c511ebef..f005b7d5293 100644
--- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc
+++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc
@@ -99,7 +99,7 @@ void
test02()
{
namespace fs = std::experimental::filesystem;
- auto dir = __gnu_test::nonexistent_path();
+ const auto dir = __gnu_test::nonexistent_path();
fs::create_directories(dir/"subdir");
std::error_code ec;
@@ -129,7 +129,12 @@ test02()
}
#endif
- fs::remove_all(dir, ec);
+ // Cannot use fs::remove_all here because that depends on
+ // recursive_directory_iterator which would use the fake readdir above.
+#ifndef _GLIBCXX_FILESYSTEM_IS_WINDOWS
+ ::rmdir((dir/"subdir").c_str());
+ ::rmdir(dir.c_str());
+#endif
}
int
More information about the Libstdc++-cvs
mailing list