Commit 790207d6 by Jonathan Wakely Committed by Jonathan Wakely

Fix test for recursive_directory_iterator::pop

	* testsuite/experimental/filesystem/iterators/pop.cc: Remove
	unreliable dependency on directory order.

From-SVN: r241583
parent f34bf3d9
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.
......
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment