From 771752c4e3b27cf8870155ed1ebefcc42352b16e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Sep 2023 14:05:07 +0100 Subject: libstdc++: Remove dg-options "-std=gnu++20" from 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/18_support/comparisons/algorithms/fallback.cc: Remove dg-options -std=gnu++2a. * testsuite/18_support/comparisons/algorithms/partial_order.cc: Likewise. * testsuite/18_support/comparisons/algorithms/strong_order.cc: Likewise. * testsuite/18_support/comparisons/algorithms/strong_order_floats.cc: Likewise. * testsuite/18_support/comparisons/algorithms/weak_order.cc: Likewise. * testsuite/18_support/comparisons/categories/94565.cc: Likewise. * testsuite/18_support/comparisons/categories/partialord.cc: Likewise. * testsuite/18_support/comparisons/categories/strongord.cc: Likewise. * testsuite/18_support/comparisons/categories/weakord.cc: Likewise. * testsuite/18_support/comparisons/categories/zero_neg.cc: Likewise. * testsuite/18_support/comparisons/common/1.cc: Likewise. * testsuite/18_support/comparisons/object/93479.cc: Likewise. * testsuite/18_support/comparisons/object/lwg3530.cc: Likewise. --- libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc | 1 - .../testsuite/18_support/comparisons/algorithms/partial_order.cc | 3 +-- .../testsuite/18_support/comparisons/algorithms/strong_order.cc | 3 +-- .../18_support/comparisons/algorithms/strong_order_floats.cc | 1 - .../testsuite/18_support/comparisons/algorithms/weak_order.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc | 3 +-- .../testsuite/18_support/comparisons/categories/partialord.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc | 4 ++-- libstdc++-v3/testsuite/18_support/comparisons/common/1.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc | 3 +-- libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc | 3 +-- 13 files changed, 12 insertions(+), 24 deletions(-) (limited to 'libstdc++-v3/testsuite/18_support') diff --git a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc index 8bf78fa..da8aaee 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/partial_order.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/partial_order.cc index 7c186e6..d83bb00 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/partial_order.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/partial_order.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/18_support/comparisons/algorithms/strong_order.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order.cc index be64071..c97f314 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order.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 } } #include #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order_floats.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order_floats.cc index e28fcac..135cba2 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order_floats.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/strong_order_floats.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/weak_order.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/weak_order.cc index a66ca6a..1ff471f 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/weak_order.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/weak_order.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/18_support/comparisons/categories/94565.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc index 624f114..47092b9 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.cc index 818f5a1..57fe68a 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc index 8799974..e23c571 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc index a0f6eb3..8667337 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc index 17a129b..9d2115b 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc @@ -15,8 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a -Wno-unused-result" } -// { dg-do compile { target c++2a } } +// { dg-options "-Wno-unused-result" } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/common/1.cc b/libstdc++-v3/testsuite/18_support/comparisons/common/1.cc index f9acf16..7050e75 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/common/1.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/common/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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc b/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc index 82e1d72..15178f7 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/object/93479.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 } } #include diff --git a/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc b/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc index f042ce0..b9a3cf5 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.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 } } #include -- cgit v1.1