git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to Filesystem tests 

* testsuite/27_io/filesystem/iterators/directory_iterator.cc: Leave
	error_code unset.
	* testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
	Check for past-the-end before dereferencing.
	* testsuite/experimental/filesystem/iterators/
	recursive_directory_iterator.cc: Likewise.

From-SVN: r254781
This commit is contained in:
Jonathan Wakely 2017-11-15 18:22:43 +00:00 committed by Jonathan Wakely
parent 54b6c06b49
commit 4e6c429837
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,12 @@
2017-11-15 Jonathan Wakely <jwakely@redhat.com> 2017-11-15 Jonathan Wakely <jwakely@redhat.com>
* testsuite/27_io/filesystem/iterators/directory_iterator.cc: Leave
error_code unset.
* testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
Check for past-the-end before dereferencing.
* testsuite/experimental/filesystem/iterators/
recursive_directory_iterator.cc: Likewise.
* include/bits/range_access.h (size, empty, data): Add conditional * include/bits/range_access.h (size, empty, data): Add conditional
noexcept to generic overloads. noexcept to generic overloads.

1
libstdc++-v3/testsuite/27_io/filesystem/iterators/directory_iterator.cc
View File

@ -61,7 +61,6 @@ test01()
ec = bad_ec; ec = bad_ec;
permissions(p, fs::perms::none, ec); permissions(p, fs::perms::none, ec);
VERIFY( !ec ); VERIFY( !ec );
ec = bad_ec;
iter = fs::directory_iterator(p, ec); iter = fs::directory_iterator(p, ec);
VERIFY( ec ); VERIFY( ec );
VERIFY( iter == end(iter) ); VERIFY( iter == end(iter) );

2
libstdc++-v3/testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc
View File

@ -87,6 +87,7 @@ test01()
VERIFY( iter != end(iter) ); VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1" ); VERIFY( iter->path() == p/"d1" );
++iter; // should recurse into d1 ++iter; // should recurse into d1
VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1/d2" ); VERIFY( iter->path() == p/"d1/d2" );
iter.increment(ec); // should fail to recurse into p/d1/d2 iter.increment(ec); // should fail to recurse into p/d1/d2
VERIFY( ec ); VERIFY( ec );
@ -99,6 +100,7 @@ test01()
VERIFY( iter != end(iter) ); VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1" ); VERIFY( iter->path() == p/"d1" );
++iter; // should recurse into d1 ++iter; // should recurse into d1
VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1/d2" ); VERIFY( iter->path() == p/"d1/d2" );
ec = bad_ec; ec = bad_ec;
iter.increment(ec); // should fail to recurse into p/d1/d2, so skip it iter.increment(ec); // should fail to recurse into p/d1/d2, so skip it

2
libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc
View File

@ -56,6 +56,7 @@ test01()
VERIFY( iter != end(iter) ); VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1" ); VERIFY( iter->path() == p/"d1" );
++iter; ++iter;
VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1/d2" ); VERIFY( iter->path() == p/"d1/d2" );
++iter; ++iter;
VERIFY( iter == end(iter) ); VERIFY( iter == end(iter) );
@ -88,6 +89,7 @@ test01()
VERIFY( iter != end(iter) ); VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1" ); VERIFY( iter->path() == p/"d1" );
++iter; // should recurse into d1 ++iter; // should recurse into d1
VERIFY( iter != end(iter) );
VERIFY( iter->path() == p/"d1/d2" ); VERIFY( iter->path() == p/"d1/d2" );
iter.increment(ec); // should fail to recurse into p/d1/d2 iter.increment(ec); // should fail to recurse into p/d1/d2
VERIFY( ec ); VERIFY( ec );