From ad60f42883a5641d4d8e7f5e9017b473cec29f93 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 6 Jun 2019 16:34:51 +0100 Subject: [PATCH] Fix more failing tests for C++98 mode * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Add dg-prune-output for different C++98 diagnostic. * testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise. * testsuite/libstdc++-prettyprinters/compat.cc: Do not run for C++98. From-SVN: r272010 --- libstdc++-v3/ChangeLog | 26 +++++++++++++++++++ .../deque/requirements/dr438/assign_neg.cc | 1 + .../requirements/dr438/constructor_1_neg.cc | 1 + .../requirements/dr438/constructor_2_neg.cc | 1 + .../deque/requirements/dr438/insert_neg.cc | 1 + .../list/requirements/dr438/assign_neg.cc | 1 + .../requirements/dr438/constructor_1_neg.cc | 1 + .../requirements/dr438/constructor_2_neg.cc | 1 + .../list/requirements/dr438/insert_neg.cc | 1 + .../vector/requirements/dr438/assign_neg.cc | 1 + .../requirements/dr438/constructor_1_neg.cc | 1 + .../requirements/dr438/constructor_2_neg.cc | 1 + .../vector/requirements/dr438/insert_neg.cc | 1 + .../libstdc++-prettyprinters/compat.cc | 2 +- 14 files changed, 39 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 47dee9ea637..f1294f0c058 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,31 @@ 2019-06-06 Jonathan Wakely + * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Add + dg-prune-output for different C++98 diagnostic. + * testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc: + Likewise. + * testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc: + Likewise. + * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: + Likewise. + * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: + Likewise. + * testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc: + Likewise. + * testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc: + Likewise. + * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: + Likewise. + * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: + Likewise. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_1_neg.cc: Likewise. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_2_neg.cc: Likewise. + * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: + Likewise. + * testsuite/libstdc++-prettyprinters/compat.cc: Do not run for C++98. + * testsuite/23_containers/unordered_map/requirements/debug_container.cc: Do not test allocator rebinding extension for C++2a. * testsuite/23_containers/unordered_set/allocator/ext_ptr.cc: Change diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc index 0be1e965103..fdb03865e3d 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_assign" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc index d99bd63abb5..1cb8cf1a7ec 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc index 9962bbfa225..4d3c9b31434 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc index 8051196011b..83ee4492ff3 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_insert" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc index a3da00b03e9..a4dd34d8a6d 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_assign" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc index fc8d48fb934..4cb886c3006 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc index 0fccc43192f..b186b067cc3 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc index 86a1b3c53a0..e617e67d5df 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc index ae825128c58..397445612c5 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_assign" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc index 2794cae0935..f78f750cf5a 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc index f8fe1d6618e..4d1b774d75c 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_initialize" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc index 55fcc00bc51..fee6d70c3c1 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc @@ -18,6 +18,7 @@ // . // { dg-do compile } +// { dg-prune-output "cannot convert" } // { dg-prune-output "no matching function .*_M_fill_insert" } #include diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc index 28b0c2154d7..8c94e836808 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc @@ -1,5 +1,5 @@ // { dg-options "-g -O0" } -// { dg-do run } +// { dg-do run { target c++11 } } // Copyright (C) 2014-2019 Free Software Foundation, Inc. // -- 2.30.2