aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/21_strings
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-09-15 14:27:56 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-09-16 00:10:45 +0100
commitd8c446a147efe9f25247e2726caec1f52e61b4d3 (patch)
tree1b8306bf81b49378f349a356ec0ad192692a719b /libstdc++-v3/testsuite/21_strings
parent6d0b43f5b81c35f4be6e33770b37060f12340a65 (diff)
downloadgcc-d8c446a147efe9f25247e2726caec1f52e61b4d3.zip
gcc-d8c446a147efe9f25247e2726caec1f52e61b4d3.tar.gz
gcc-d8c446a147efe9f25247e2726caec1f52e61b4d3.tar.bz2
libstdc++: Remove dg-options "-std=gnu++20" from 21_strings 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/21_strings/basic_string/cons/char/105995.cc: Remove dg-options -std=gnu++20. * testsuite/21_strings/basic_string/cons/char/constexpr.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc: Likewise. * testsuite/21_strings/basic_string/erasure.cc: Likewise. * testsuite/21_strings/basic_string/hash/hash_char8_t.cc: Likewise. * testsuite/21_strings/basic_string/literals/constexpr.cc: Likewise. * testsuite/21_strings/basic_string/modifiers/constexpr.cc: Likewise. * testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc: Likewise. * testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc: Likewise. * testsuite/21_strings/basic_string/operations/ends_with/char.cc: Likewise. * testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc: Likewise. * testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc: Likewise. * testsuite/21_strings/basic_string/operations/starts_with/char.cc: Likewise. * testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc: Likewise. * testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc: Likewise. * testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc: Likewise. * testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc: Likewise. * testsuite/21_strings/basic_string_view/cons/char/range.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/ends_with/char.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/starts_with/char.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc: Likewise. * testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc: Likewise. * testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc: Likewise. * testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc: Likewise. * testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc: Likewise.
Diffstat (limited to 'libstdc++-v3/testsuite/21_strings')
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc3
-rw-r--r--libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc1
30 files changed, 21 insertions, 47 deletions
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
index 4764cef..ad3ec1f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
index 5a1c0e6..8c60708 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
index 260f8b3..40cea53 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc
index d12ce9e..b85496a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc
index c542044..ae2dc2c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
#include <string>
#include <memory_resource>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
index f1ccb5d..c2b54f1 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
index 77fe59b..0e28a6d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
index 6b3a304..09d09af 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
index 1137a3e..de774bb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
index f1e4ea3..1fd3455 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
index ba77f01..7e720be 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++20 } }
#include <testsuite_string.h>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
index e8fef74..30c446f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
index c8357d2..f9e263b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
index a023d9e..fe8c6a7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++20 } }
#include <testsuite_string.h>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
index aaef4cb..ee685b9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc
index b78195f..fe69635 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// C++20 21.3.3.2 Non-member comparison functions [string.cmp]
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc
index ed9f61e..4ae4d3d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// C++20 21.3.3.2 Non-member comparison functions [string.cmp]
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc
index 568b8a0..d28b235 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc
index 309e919..b91fea0 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc
index adfbf0a..0f692d7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
index e5ce2f0..6153363 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
index 50437bb..7521b62 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++20 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
index 6984a7f..9e83c85 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
index ec0bc05..4f24290 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
index fedba28a..dfdf225 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++20 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
index 8535d7a..1d8c643 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc
index 0ce700c..537505b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/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.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc
index 9911b69..50df0ac 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/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.
//
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc
index 249e48d..954c7ee 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
//
// Copyright (C) 2019-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
index bdc0b0a..805b84de 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// Copyright (C) 2017-2023 Free Software Foundation, Inc.