[committed 02/11] libstdc++: Remove dg-options "-std=gnu++20" from <compare> tests

Jonathan Wakely jwakely@redhat.com
Fri Sep 15 23:18:50 GMT 2023


Tested aarch64-linux. Pushed to trunk.

-- >8 --

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.
---
 .../testsuite/18_support/comparisons/algorithms/fallback.cc   | 1 -
 .../18_support/comparisons/algorithms/partial_order.cc        | 3 +--
 .../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 +--
 .../testsuite/18_support/comparisons/categories/94565.cc      | 3 +--
 .../testsuite/18_support/comparisons/categories/partialord.cc | 3 +--
 .../testsuite/18_support/comparisons/categories/strongord.cc  | 3 +--
 .../testsuite/18_support/comparisons/categories/weakord.cc    | 3 +--
 .../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 +--
 .../testsuite/18_support/comparisons/object/lwg3530.cc        | 3 +--
 13 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc b/libstdc++-v3/testsuite/18_support/comparisons/algorithms/fallback.cc
index 8bf78faf232..da8aaeedcb4 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 <compare>
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 7c186e607b4..d83bb000160 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <compare>
 #include <limits>
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 be640714245..c97f31442db 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 #include <limits>
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 e28fcac6e11..135cba2e658 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 <compare>
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 a66ca6a51e0..1ff471f7203 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <compare>
 #include <limits>
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc
index 624f114204d..47092b9116c 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/partialord.cc
index 818f5a17b15..57fe68a3d82 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/strongord.cc
index 87999741536..e23c571c909 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/weakord.cc
index a0f6eb3677c..866733741f8 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
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 17a129bcb75..9d2115b3f4f 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
 // <http://www.gnu.org/licenses/>.
 
-// { 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 <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/common/1.cc b/libstdc++-v3/testsuite/18_support/comparisons/common/1.cc
index f9acf163ed0..7050e75327a 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc b/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc
index 82e1d72f03d..15178f7c27f 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc b/libstdc++-v3/testsuite/18_support/comparisons/object/lwg3530.cc
index f042ce0f1dc..b9a3cf55ee6 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <compare>
 
-- 
2.41.0



More information about the Gcc-patches mailing list