From 1b120c61b6528199d5505c9f840f711224ecf0e7 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Oct 2019 13:55:14 +0100 Subject: [PATCH] Fix more failing tests for C++98 mode Backport from mainline 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. From-SVN: r277391 --- libstdc++-v3/ChangeLog | 29 +++++++++++++++++++ .../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, 42 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f4ce7a37ee0c..3be876e9c111 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -3,6 +3,35 @@ Backport from mainline 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. + + Backport from mainline + 2019-06-06 Jonathan Wakely + * testsuite/20_util/is_nothrow_invocable/value.cc: Test converting to void. * testsuite/experimental/names.cc: Do not run for C++98 mode. Do not 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 0be1e9651036..fdb03865e3d1 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 d99bd63abb53..1cb8cf1a7ec3 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 9962bbfa225e..4d3c9b314349 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 8051196011ba..83ee4492ff3f 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 a3da00b03e91..a4dd34d8a6d1 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 fc8d48fb934d..4cb886c30064 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 0fccc43192f2..b186b067cc34 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 86a1b3c53a01..e617e67d5df3 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 ae825128c58b..397445612c5d 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 2794cae09354..f78f750cf5ab 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 f8fe1d6618e8..4d1b774d75c0 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 55fcc00bc517..fee6d70c3c11 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 a538b8540388..255d3e7cff1e 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 } } // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2014-2019 Free Software Foundation, Inc. -- 2.47.3