diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-05-09 12:50:01 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-05-09 12:50:01 +0100 |
| commit | 7972e24663f00ba9319b71b6cb7d931d6ded5fa1 (patch) | |
| tree | b6b3368794c9282d74820f4801134aa9a3fa2317 | |
| parent | 035b8879acaccdbf52d24730fe241e97d660d53d (diff) | |
| download | gcc-7972e24663f00ba9319b71b6cb7d931d6ded5fa1.zip gcc-7972e24663f00ba9319b71b6cb7d931d6ded5fa1.tar.gz gcc-7972e24663f00ba9319b71b6cb7d931d6ded5fa1.tar.bz2 | |
libstdc++/71004 fix recent additions to testcase
PR libstdc++/71004
* testsuite/experimental/filesystem/iterators/
recursive_directory_iterator.cc: Fix test02 to not call member
functions on invalid iterator, and use VERIFY not assert.
From-SVN: r236028
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6f4ae5f..1cdb7f4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2016-05-09 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/71004 + * testsuite/experimental/filesystem/iterators/ + recursive_directory_iterator.cc: Fix test02 to not call member + functions on invalid iterator, and use VERIFY not assert. + 2016-05-09 Ville Voutilainen <ville.voutilainen@gmail.com> Avoid endless run-time recursion for copying single-element 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 a263602..b5f71be 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc @@ -100,15 +100,16 @@ test01() void test02() { + bool test __attribute__((unused)) = false; + // libstdc++71004 const fs::recursive_directory_iterator it; - assert( it.options() == fs::directory_options{} ); - assert( it.depth() == 0 ); - assert(it.recursion_pending() == false); + VERIFY( it == fs::recursive_directory_iterator() ); } int main() { test01(); + test02(); } |