diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-26 17:25:44 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-26 17:25:44 +0100 |
| commit | 790207d6459bcb18ba3fe6a84d591e48ce30dc0f (patch) | |
| tree | 6deb20932ac95c94aaf855cfe28963b2fa94a8d6 | |
| parent | f34bf3d9398575b787dadb6f205676792d3c2973 (diff) | |
| download | gcc-790207d6459bcb18ba3fe6a84d591e48ce30dc0f.zip gcc-790207d6459bcb18ba3fe6a84d591e48ce30dc0f.tar.gz gcc-790207d6459bcb18ba3fe6a84d591e48ce30dc0f.tar.bz2 | |
Fix test for recursive_directory_iterator::pop
* testsuite/experimental/filesystem/iterators/pop.cc: Remove
unreliable dependency on directory order.
From-SVN: r241583
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/iterators/pop.cc | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9b73a08..1c878a2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-10-26 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/experimental/filesystem/iterators/pop.cc: Remove + unreliable dependency on directory order. + 2016-10-26 Edward Smith-Rowland <3dw4rd@verizon.net> Implement uniform_inside_sphere_distribution extension. diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/pop.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/pop.cc index fa1ae62..d247ab4 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/pop.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/pop.cc @@ -78,13 +78,11 @@ test03() create_directories(p / "d1/d2/d3"); create_directories(p / "d1/d2/e3"); create_directories(p / "d1/e2/d3"); - create_directories(p / "e1"); - __gnu_test::scoped_file f(p / "d1/d2/d3/f"); - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 3; ++i) { fs::recursive_directory_iterator dir(p); std::advance(dir, i); - int expected_depth = std::min(i, 3); // fourth entry is a file, not dir + int expected_depth = i; VERIFY( dir.depth() == expected_depth ); __builtin_printf("%d %d %s\n", i, dir.depth(), dir->path().c_str()); dir.pop(ec); @@ -102,7 +100,6 @@ test03() if (dir != end(dir)) VERIFY( dir.depth() == (i -1) ); } - f.path.clear(); remove_all(p, ec); } |