[gcc r14-4047] libstdc++: Replace dg-options "-std=c++11" with dg-add-options strict_std

Jonathan Wakely redi@gcc.gnu.org
Fri Sep 15 23:03:42 GMT 2023


https://gcc.gnu.org/g:52841fb7035c0e3a6d4354fc4e61c0bd3fea81ca

commit r14-4047-g52841fb7035c0e3a6d4354fc4e61c0bd3fea81ca
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Sep 4 14:10:15 2023 +0100

    libstdc++: Replace dg-options "-std=c++11" with dg-add-options strict_std
    
    These tests can (and should) also be run for later standards, so replace
    the { dg-options "-std=c++11" } with { dg-add-options strict_std } and a
    target selector for c++11.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/23_containers/deque/48101-2_neg.cc: Replace
            dg-options with target selector.
            * testsuite/23_containers/forward_list/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/list/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/map/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/map/48101_neg.cc: Likewise.
            * testsuite/23_containers/multimap/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/multimap/48101_neg.cc: Likewise.
            * testsuite/23_containers/multiset/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/set/48101-2_neg.cc: Likewise.
            * testsuite/23_containers/unordered_map/48101-2_neg.cc:
            Likewise.
            * testsuite/23_containers/unordered_multimap/48101-2_neg.cc:
            Likewise.
            * testsuite/23_containers/unordered_multiset/48101-2_neg.cc:
            Likewise.
            * testsuite/23_containers/unordered_set/48101-2_neg.cc:
            Likewise.
            * testsuite/23_containers/vector/48101-2_neg.cc: Likewise.

Diff:
---
 libstdc++-v3/testsuite/23_containers/deque/48101-2_neg.cc             | 4 ++--
 libstdc++-v3/testsuite/23_containers/forward_list/48101-2_neg.cc      | 4 ++--
 libstdc++-v3/testsuite/23_containers/list/48101-2_neg.cc              | 4 ++--
 libstdc++-v3/testsuite/23_containers/map/48101-2_neg.cc               | 4 ++--
 libstdc++-v3/testsuite/23_containers/map/48101_neg.cc                 | 3 +--
 libstdc++-v3/testsuite/23_containers/multimap/48101-2_neg.cc          | 4 ++--
 libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc            | 3 +--
 libstdc++-v3/testsuite/23_containers/multiset/48101-2_neg.cc          | 4 ++--
 libstdc++-v3/testsuite/23_containers/set/48101-2_neg.cc               | 4 ++--
 libstdc++-v3/testsuite/23_containers/unordered_map/48101-2_neg.cc     | 4 ++--
 .../testsuite/23_containers/unordered_multimap/48101-2_neg.cc         | 4 ++--
 .../testsuite/23_containers/unordered_multiset/48101-2_neg.cc         | 4 ++--
 libstdc++-v3/testsuite/23_containers/unordered_set/48101-2_neg.cc     | 4 ++--
 libstdc++-v3/testsuite/23_containers/vector/48101-2_neg.cc            | 4 ++--
 14 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/libstdc++-v3/testsuite/23_containers/deque/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/48101-2_neg.cc
index 041f0cb88b3..d5cb13ec4db 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <deque>
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/48101-2_neg.cc
index 2a21876c1cf..d5cc81c6b48 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <forward_list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/48101-2_neg.cc
index 0e96022cdfe..5cea21992d9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101-2_neg.cc
index 06c4dc9e9ef..8cda993e2cb 100644
--- a/libstdc++-v3/testsuite/23_containers/map/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
index e9029caad21..81837954125 100644
--- a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101-2_neg.cc
index fd77071a2a5..6022039e004 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
index 942a5aaf2ff..55626edfc2d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/48101-2_neg.cc
index c1c1f64d6c5..619b97ee4a5 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/48101-2_neg.cc
index 6466b38901d..d83a08c9856 100644
--- a/libstdc++-v3/testsuite/23_containers/set/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/48101-2_neg.cc
index 8ea74e6c04b..c45ef0daa50 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-2_neg.cc
index 38afec91b34..39eeb0f76d8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-2_neg.cc
index 389cb947cbe..006716e0d69 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/48101-2_neg.cc
index 08ef3b587a4..ed5a7787525 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/48101-2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/48101-2_neg.cc
index ed5111224e9..0dd75956ce6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/48101-2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/48101-2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile }
-// { dg-options "-std=c++11" }
+// { dg-do compile { target c++11 } }
+// { dg-add-options strict_std }
 
 #include <vector>


More information about the Gcc-cvs mailing list