From 7972e24663f00ba9319b71b6cb7d931d6ded5fa1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 9 May 2016 12:50:01 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 7 +++++++ .../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 6f4ae5f4950..1cdb7f4e911 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2016-05-09 Jonathan Wakely + + 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 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 a2636029f42..b5f71be653d 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(); }