From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Update tests on trunk [PR106201]
Date: Fri, 25 Nov 2022 00:21:31 +0000 [thread overview]
Message-ID: <20221125002131.41071-1-jwakely@redhat.com> (raw)
Tested x86_64-linux. Pushed to trunk.
-- >8 --
This copies the better tests from gcc-12 to trunk.
libstdc++-v3/ChangeLog:
PR libstdc++/106201
* testsuite/27_io/filesystem/iterators/106201.cc: Improve test.
* testsuite/experimental/filesystem/iterators/106201.cc: New test.
---
.../testsuite/27_io/filesystem/iterators/106201.cc | 8 +++++---
.../experimental/filesystem/iterators/106201.cc | 14 ++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc
index 4a64e675816..c5fefd9ac3f 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc
@@ -5,8 +5,10 @@
// PR libstdc++/106201 constraint recursion in path(Source const&) constructor.
#include <filesystem>
-#include <ranges>
-using I = std::counted_iterator<std::filesystem::directory_iterator>;
+#include <iterator>
+#include <concepts>
+namespace fs = std::filesystem;
+using I = std::counted_iterator<fs::directory_iterator>;
static_assert( std::swappable<I> );
-using R = std::counted_iterator<std::filesystem::recursive_directory_iterator>;
+using R = std::counted_iterator<fs::recursive_directory_iterator>;
static_assert( std::swappable<R> );
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc
new file mode 100644
index 00000000000..017b72ef5f6
--- /dev/null
+++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc
@@ -0,0 +1,14 @@
+// { dg-options "-std=gnu++20" }
+// { dg-do compile { target c++20 } }
+// { dg-require-filesystem-ts "" }
+
+// PR libstdc++/106201 constraint recursion in path(Source const&) constructor.
+
+#include <experimental/filesystem>
+#include <iterator>
+#include <concepts>
+namespace fs = std::experimental::filesystem;
+using I = std::counted_iterator<fs::directory_iterator>;
+static_assert( std::swappable<I> );
+using R = std::counted_iterator<fs::recursive_directory_iterator>;
+static_assert( std::swappable<R> );
--
2.38.1
reply other threads:[~2022-11-25 0:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221125002131.41071-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).