From f1b06f571dfe4c854cd57482ca87d5ca9f0d570d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Sep 2023 14:27:56 +0100 Subject: [PATCH] libstdc++: Remove dg-options "-std=gnu++20" from 27_io tests The testsuite will automatically select C++20 for these tests now, and removing the hardcoded -std option allows them to be tested for C++23 and C++26 as well. libstdc++-v3/ChangeLog: * testsuite/27_io/basic_istream/extractors_character/char/lwg2499.cc: Remove dg-options -std=gnu++2a. * testsuite/27_io/basic_istream/extractors_character/char/lwg2499_neg.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499_neg.cc: Likewise. * testsuite/27_io/basic_istringstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istringstream/str/char/2.cc: Likewise. * testsuite/27_io/basic_istringstream/str/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_istringstream/view/char/1.cc: Likewise. * testsuite/27_io/basic_istringstream/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_ostream/emit/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: Likewise. * testsuite/27_io/basic_ostringstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/str/char/3.cc: Likewise. * testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc: Likewise. * testsuite/27_io/basic_ostringstream/view/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringbuf/cons/char/2.cc: Likewise. * testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_stringbuf/str/char/4.cc: Likewise. * testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc: Likewise. * testsuite/27_io/basic_stringbuf/view/char/1.cc: Likewise. * testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_stringstream/cons/char/97719.cc: Likewise. * testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringstream/str/char/5.cc: Likewise. * testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc: Likewise. * testsuite/27_io/basic_stringstream/view/char/1.cc: Likewise. * testsuite/27_io/basic_stringstream/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_syncbuf/1.cc: Likewise. * testsuite/27_io/basic_syncbuf/2.cc: Likewise. * testsuite/27_io/basic_syncbuf/basic_ops/1.cc: Likewise. * testsuite/27_io/basic_syncbuf/requirements/types.cc: Likewise. * testsuite/27_io/basic_syncbuf/sync_ops/1.cc: Likewise. * testsuite/27_io/basic_syncstream/1.cc: Likewise. * testsuite/27_io/basic_syncstream/2.cc: Likewise. * testsuite/27_io/basic_syncstream/basic_ops/1.cc: Likewise. * testsuite/27_io/basic_syncstream/requirements/types.cc: Likewise. * testsuite/27_io/filesystem/iterators/106201.cc: Likewise. * testsuite/27_io/filesystem/iterators/lwg3719.cc: Likewise. * testsuite/27_io/filesystem/path/factory/u8path-depr.cc: Likewise. * testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc: Likewise. --- .../27_io/basic_istream/extractors_character/char/lwg2499.cc | 3 +-- .../basic_istream/extractors_character/char/lwg2499_neg.cc | 3 +-- .../basic_istream/extractors_character/wchar_t/lwg2499.cc | 3 +-- .../basic_istream/extractors_character/wchar_t/lwg2499_neg.cc | 3 +-- .../testsuite/27_io/basic_istringstream/cons/char/1.cc | 3 +-- .../testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/2.cc | 3 +-- .../testsuite/27_io/basic_istringstream/str/wchar_t/2.cc | 3 +-- .../testsuite/27_io/basic_istringstream/view/char/1.cc | 3 +-- .../testsuite/27_io/basic_istringstream/view/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_ostream/emit/1.cc | 3 +-- .../27_io/basic_ostream/inserters_character/char/deleted.cc | 3 +-- .../27_io/basic_ostream/inserters_character/wchar_t/deleted.cc | 3 +-- .../testsuite/27_io/basic_ostringstream/cons/char/1.cc | 3 +-- .../testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/3.cc | 3 +-- .../testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc | 3 +-- .../testsuite/27_io/basic_ostringstream/view/char/1.cc | 3 +-- .../testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/2.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/4.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc | 3 +-- .../testsuite/27_io/basic_stringstream/cons/char/97719.cc | 3 +-- .../testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/5.cc | 3 +-- .../testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc | 3 +-- .../testsuite/27_io/basic_stringstream/view/wchar_t/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncbuf/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncbuf/2.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncbuf/basic_ops/1.cc | 3 +-- .../testsuite/27_io/basic_syncbuf/requirements/types.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncbuf/sync_ops/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncstream/1.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncstream/2.cc | 3 +-- libstdc++-v3/testsuite/27_io/basic_syncstream/basic_ops/1.cc | 3 +-- .../testsuite/27_io/basic_syncstream/requirements/types.cc | 3 +-- libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc | 1 - libstdc++-v3/testsuite/27_io/filesystem/iterators/lwg3719.cc | 1 - .../testsuite/27_io/filesystem/path/factory/u8path-depr.cc | 1 - .../testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc | 3 +-- 45 files changed, 42 insertions(+), 87 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499.cc index 75ec75b7f4e7..060cb935ac1d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // LWG 2499 // operator>>(basic_istream&, CharT*) makes it hard to avoid buffer overflows diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499_neg.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499_neg.cc index a2143651c7ee..02b0e9aaed10 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499_neg.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/lwg2499_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // LWG 2499 // operator>>(basic_istream&, CharT*) makes it hard to avoid buffer overflows diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499.cc index 62689b3f30ed..9605a4f8f3ab 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // LWG 2499 // operator>>(basic_istream&, CharT*) makes it hard to avoid buffer overflows diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499_neg.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499_neg.cc index dae49353d1fe..3e808aafc6c8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499_neg.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/lwg2499_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // LWG 2499 // operator>>(basic_istream&, CharT*) makes it hard to avoid buffer overflows diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc index e5b141dd327a..923eaa0cbdda 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.3.2 basic_istringstream constructors [istringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc index 771e149c1e3b..f75afcc13913 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.3.2 basic_istringstream constructors [istringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/2.cc index 944773187675..641cf52c9f5b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/2.cc @@ -17,8 +17,7 @@ // 29.8.3.4 basic_istringstream member functions [istringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/2.cc index 6a848f4b505d..0d4ee3681432 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/2.cc @@ -17,8 +17,7 @@ // 29.8.3.4 basic_istringstream member functions [istringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc index 04aae8175692..781c9abd98c5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc @@ -17,8 +17,7 @@ // 29.8.3.4 basic_istringstream member functions [istringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc index 06b04b3c6b97..ed6b905075b0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc @@ -17,8 +17,7 @@ // 27.7.1.1 basic_stringbuf constructors [lib.stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/emit/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/emit/1.cc index a72ba45adb59..2c2709aaf864 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/emit/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/emit/1.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } // { dg-additional-options "-pthread" { target pthread } } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } // { dg-require-effective-target rtti } diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc index d23a3e92efbc..73c0ab3d2c8e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc @@ -19,8 +19,7 @@ // Test character inserters defined as deleted by P1423. -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc index fddadeb6f7e7..b3bcbb01bcc1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc @@ -19,8 +19,7 @@ // Test wide character inserters defined as deleted by P1423. -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc index af8766f552a3..d43472b014e0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.4.2 basic_ostringstream constructors [ostringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc index 3e5eda336bbc..71572572ed1e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.4.2 basic_ostringstream constructors [ostringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/3.cc index 3dabd323457e..fbb77d0ee8da 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/3.cc @@ -17,8 +17,7 @@ // 29.8.4.4 basic_ostringstream member functions [ostringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc index 13d862be941d..bb1aefe9d9d8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/3.cc @@ -17,8 +17,7 @@ // 29.8.4.4 basic_ostringstream member functions [ostringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc index 41279083a06f..ab938a7d11f7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc @@ -17,8 +17,7 @@ // 29.8.4.4 basic_ostringstream member functions [ostringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc index 2f177d45d706..bc5f9ab7a40a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc @@ -17,8 +17,7 @@ // 29.8.4.4 basic_ostringstream member functions [ostringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/2.cc index 28c0e2c14bec..bfc2ee2d5c0a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/2.cc @@ -17,8 +17,7 @@ // C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc index cbe9360dc7f8..0c7352c9d2e4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/2.cc @@ -17,8 +17,7 @@ // C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/4.cc index efa0cc7d7cc8..b2dc2a32b0e5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/4.cc @@ -17,8 +17,7 @@ // 29.8.2.4 basic_stringbuf member functions [stringbuf.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc index 4a002b92eeb0..349be66c01de 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/4.cc @@ -17,8 +17,7 @@ // 29.8.2.4 basic_stringbuf member functions [stringbuf.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc index 138f4b124e55..4e58113d488e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc @@ -17,8 +17,7 @@ // 27.7.1.1 basic_stringbuf constructors [lib.stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc index 30b8f0549f40..a303d3b565c5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc @@ -17,8 +17,7 @@ // 27.7.1.1 basic_stringbuf constructors [lib.stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc index 9eff3979d28d..abbad3626b1e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.5.2 basic_stringstream constructors [stringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/97719.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/97719.cc index 6a65d522543a..ad783589ed97 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/97719.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/97719.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc index 8007b5361d9c..e1a308a5a858 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc @@ -17,8 +17,7 @@ // C++20 29.8.5.2 basic_stringstream constructors [stringstream.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/5.cc index e5030237fea0..812c4dd6b846 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/5.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/5.cc @@ -17,8 +17,7 @@ // 29.8.5.4 basic_stringstream member functions [stringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc index 370760ee56d3..109ffed624e2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/5.cc.cc @@ -17,8 +17,7 @@ // 29.8.5.4 basic_stringstream member functions [stringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc index 91d329dfa86c..c86933c51893 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc @@ -17,8 +17,7 @@ // 29.8.5.4 basic_stringstream member functions [stringstream.members] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc index 7af53dcd16f1..73bde02829a9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc @@ -17,8 +17,7 @@ // 27.7.1.1 basic_stringbuf constructors [lib.stringbuf.cons] -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncbuf/1.cc b/libstdc++-v3/testsuite/27_io/basic_syncbuf/1.cc index 80ccce8b0e13..d48ad0900864 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncbuf/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncbuf/1.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncbuf/2.cc b/libstdc++-v3/testsuite/27_io/basic_syncbuf/2.cc index a58da3df20cc..ad1ab383b1c6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncbuf/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncbuf/2.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } // { dg-require-effective-target hosted } diff --git a/libstdc++-v3/testsuite/27_io/basic_syncbuf/basic_ops/1.cc b/libstdc++-v3/testsuite/27_io/basic_syncbuf/basic_ops/1.cc index 8c1c99ae6ff1..2e719b070a62 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncbuf/basic_ops/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncbuf/basic_ops/1.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } // { dg-additional-options "-pthread" { target pthread } } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncbuf/requirements/types.cc b/libstdc++-v3/testsuite/27_io/basic_syncbuf/requirements/types.cc index 355941de1826..9364a30b8df0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncbuf/requirements/types.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncbuf/requirements/types.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncbuf/sync_ops/1.cc b/libstdc++-v3/testsuite/27_io/basic_syncbuf/sync_ops/1.cc index 753a341c3728..2f82669eecf0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncbuf/sync_ops/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncbuf/sync_ops/1.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } // { dg-require-gthreads "" } // { dg-add-options libatomic } diff --git a/libstdc++-v3/testsuite/27_io/basic_syncstream/1.cc b/libstdc++-v3/testsuite/27_io/basic_syncstream/1.cc index 80ccce8b0e13..d48ad0900864 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncstream/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncstream/1.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncstream/2.cc b/libstdc++-v3/testsuite/27_io/basic_syncstream/2.cc index a58da3df20cc..ad1ab383b1c6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncstream/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncstream/2.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } // { dg-require-effective-target hosted } diff --git a/libstdc++-v3/testsuite/27_io/basic_syncstream/basic_ops/1.cc b/libstdc++-v3/testsuite/27_io/basic_syncstream/basic_ops/1.cc index 60181a5d3268..39c0d9182096 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncstream/basic_ops/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncstream/basic_ops/1.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } // { dg-additional-options "-pthread" { target pthread } } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/basic_syncstream/requirements/types.cc b/libstdc++-v3/testsuite/27_io/basic_syncstream/requirements/types.cc index 990e6dccc6f6..92ad9440b157 100644 --- a/libstdc++-v3/testsuite/27_io/basic_syncstream/requirements/types.cc +++ b/libstdc++-v3/testsuite/27_io/basic_syncstream/requirements/types.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } // { dg-require-effective-target cxx11_abi } #include diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc index c5fefd9ac3f9..4002c7aa787f 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } // { dg-require-filesystem-ts "" } diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/lwg3719.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/lwg3719.cc index c19cddc74f92..9dcb0e0d1712 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/lwg3719.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/lwg3719.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do run { target c++20 } } // { dg-require-filesystem-ts "" } diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-depr.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-depr.cc index de54668c0552..ffa59979ec99 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-depr.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-depr.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc index 75bdea8a083c..6c51059881d7 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/nonmember/cmp_c++20.cc @@ -1,5 +1,4 @@ -// { dg-options "-std=gnu++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } // Copyright (C) 2020-2023 Free Software Foundation, Inc. // -- 2.43.5