Also fix some tests that were not cleaning up after themselves, as
identified by the change to nonexistent_path.
* testsuite/util/testsuite_fs.h (nonexistent_path): Include name
of the source file containing the caller.
* testsuite/27_io/filesystem/iterators/directory_iterator.cc: Remove
directories created by test.
* testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
Likewise.
* testsuite/experimental/filesystem/iterators/directory_iterator.cc:
Likewise.
* testsuite/experimental/filesystem/iterators/
recursive_directory_iterator.cc: Likewise.
Tested x86_64-linux, committed to trunk, and will backport to
gcc-8-branch.
commit d5b08bba526157d4cec585afade777af5f235aa7
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Thu Jan 10 10:20:49 2019 +0000
Include name of test in filesystem-test.XXXXXX filenames
Also fix some tests that were not cleaning up after themselves, as
identified by the change to nonexistent_path.
* testsuite/util/testsuite_fs.h (nonexistent_path): Include name
of the source file containing the caller.
* testsuite/27_io/filesystem/iterators/directory_iterator.cc: Remove
directories created by test.
*
testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
Likewise.
* testsuite/experimental/filesystem/iterators/directory_iterator.cc:
Likewise.
* testsuite/experimental/filesystem/iterators/
recursive_directory_iterator.cc: Likewise.
diff --git
a/libstdc++-v3/testsuite/27_io/filesystem/iterators/directory_iterator.cc
b/libstdc++-v3/testsuite/27_io/filesystem/iterators/directory_iterator.cc
index ddb424b4be0..5288bd297bd 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/directory_iterator.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/directory_iterator.cc
@@ -138,6 +138,9 @@ test05()
static_assert( noexcept(begin(it)), "begin is noexcept" );
VERIFY( end(it) == endit );
static_assert( noexcept(end(it)), "end is noexcept" );
+
+ std::error_code ec;
+ remove_all(p, ec);
}
int
diff --git
a/libstdc++-v3/testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc
b/libstdc++-v3/testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc
index bf67bfd215b..47b3266d3eb 100644
---
a/libstdc++-v3/testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc
+++
b/libstdc++-v3/testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc
@@ -179,6 +179,9 @@ test05()
static_assert( noexcept(begin(it)), "begin is noexcept" );
VERIFY( end(it) == endit );
static_assert( noexcept(end(it)), "end is noexcept" );
+
+ std::error_code ec;
+ remove_all(p, ec);
}
int
diff --git
a/libstdc++-v3/testsuite/experimental/filesystem/iterators/directory_iterator.cc
b/libstdc++-v3/testsuite/experimental/filesystem/iterators/directory_iterator.cc
index 758291afcd6..cc3cd879865 100644
---
a/libstdc++-v3/testsuite/experimental/filesystem/iterators/directory_iterator.cc
+++
b/libstdc++-v3/testsuite/experimental/filesystem/iterators/directory_iterator.cc
@@ -129,6 +129,9 @@ test05()
static_assert( noexcept(begin(it)), "begin is noexcept" );
VERIFY( end(it) == endit );
static_assert( noexcept(end(it)), "end is noexcept" );
+
+ std::error_code ec;
+ remove_all(p, ec);
}
int
diff --git
a/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc
b/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc
index ad37ba33f8e..6217aca8b9a 100644
---
a/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc
+++
b/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc
@@ -176,6 +176,9 @@ test05()
static_assert( noexcept(begin(it)), "begin is noexcept" );
VERIFY( end(it) == endit );
static_assert( noexcept(end(it)), "end is noexcept" );
+
+ std::error_code ec;
+ remove_all(p, ec);
}
int
diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h
b/libstdc++-v3/testsuite/util/testsuite_fs.h
index 64215690083..48f503b3c27 100644
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -86,8 +86,18 @@ namespace __gnu_test
// This is NOT supposed to be a secure way to get a unique name!
// We just need a path that doesn't exist for testing purposes.
test_fs::path
- nonexistent_path()
+ nonexistent_path(std::string file = __builtin_FILE())
{
+ // Include the caller's filename to help identify tests that fail to
+ // clean up the files they create.
+ // Remove .cc extension:
+ if (file.length() > 3 && file.compare(file.length() - 3, 3, ".cc") == 0)
+ file.resize(file.length() - 3);
+ // And directory:
+ auto pos = file.find_last_of("/\\");
+ if (pos != file.npos)
+ file.erase(0, pos+1);
+
test_fs::path p;
#if defined(_GNU_SOURCE) || _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
char tmp[] = "filesystem-test.XXXXXX";
@@ -97,16 +107,22 @@ namespace __gnu_test
std::error_code(errno, std::generic_category()));
::unlink(tmp);
::close(fd);
- p = tmp;
+ if (!file.empty())
+ file.insert(0, 1, '-');
+ file.insert(0, tmp);
+ p = file;
#else
- char buf[64];
+ if (file.length() > 64)
+ file.resize(64);
+ char buf[128];
static int counter;
#if _GLIBCXX_USE_C99_STDIO
- std::snprintf(buf, 64,
+ std::snprintf(buf, 128,
#else
std::sprintf(buf,
#endif
- "filesystem-test.%d.%lu", counter++, (unsigned long) ::getpid());
+ "filesystem-test.%d.%lu-%s", counter++, (unsigned long) ::getpid(),
+ file.c_str());
p = buf;
#endif
return p;
