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.
There doesn't seem to be any reason they need to use strict -std=c++20 mode, so don't add the { dg-add-options strict_std } directive, just let them use strict or non-strict modes. libstdc++-v3/ChangeLog: * testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc: Remove dg-options. * testsuite/23_containers/span/contiguous_range_neg.cc: Likewise. * testsuite/23_containers/span/everything.cc: Likewise. --- .../testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc | 1 - .../testsuite/23_containers/span/contiguous_range_neg.cc | 3 +-- libstdc++-v3/testsuite/23_containers/span/everything.cc | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc b/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc index df68fb7c82f..1964803cbd1 100644 --- a/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc +++ b/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=c++20" } // { dg-do compile { target c++20 } } #include <cuchar> diff --git a/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc b/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc index d5f64922052..2ed44740a86 100644 --- a/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-std=c++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include <span> #include <deque> diff --git a/libstdc++-v3/testsuite/23_containers/span/everything.cc b/libstdc++-v3/testsuite/23_containers/span/everything.cc index 74f943e937f..31c17346dd3 100644 --- a/libstdc++-v3/testsuite/23_containers/span/everything.cc +++ b/libstdc++-v3/testsuite/23_containers/span/everything.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-std=c++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include <testsuite_hooks.h> -- 2.41.0