diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-06-23 14:25:49 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-06-23 17:19:38 +0100 |
| commit | 7c1c7e120cca183671b11ba68a6350c8800823c0 (patch) | |
| tree | a5eb751fe564102b1df36fca8895edc2b73ae61e /libstdc++-v3/testsuite/experimental/filesystem | |
| parent | 124a9e08b7a83795bd4d09001955f0eef68ecd00 (diff) | |
| download | gcc-7c1c7e120cca183671b11ba68a6350c8800823c0.zip gcc-7c1c7e120cca183671b11ba68a6350c8800823c0.tar.gz gcc-7c1c7e120cca183671b11ba68a6350c8800823c0.tar.bz2 | |
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.
Diffstat (limited to 'libstdc++-v3/testsuite/experimental/filesystem')
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc index 806c511..f005b7d 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 |