From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B5A403959E66; Mon, 14 Jun 2021 18:52:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5A403959E66 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9916] libstdc++: Adjust expected errors in tests when compiled as C++20 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 37864c5e6aa6befc17051f162c02d4f593a57e57 X-Git-Newrev: 1bb1b6a5e7010217aa3cdde147b9a6ab0160060f Message-Id: <20210614185214.B5A403959E66@sourceware.org> Date: Mon, 14 Jun 2021 18:52:14 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 18:52:14 -0000 https://gcc.gnu.org/g:1bb1b6a5e7010217aa3cdde147b9a6ab0160060f commit r10-9916-g1bb1b6a5e7010217aa3cdde147b9a6ab0160060f Author: Jonathan Wakely Date: Mon May 10 15:10:45 2021 +0100 libstdc++: Adjust expected errors in tests when compiled as C++20 libstdc++-v3/ChangeLog: * testsuite/20_util/scoped_allocator/69293_neg.cc: Add dg-error for additional errors in C++20. * testsuite/20_util/uses_allocator/69293_neg.cc: Likewise. * testsuite/20_util/uses_allocator/cons_neg.cc: Likewise. (cherry picked from commit 23972128c83e62011b583f06b32c8501c096b7d8) Diff: --- libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc | 1 + libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc | 3 ++- libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc index 6f3cd0a2521..975862b3365 100644 --- a/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc +++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/69293_neg.cc @@ -47,6 +47,7 @@ test01() auto p = sa.allocate(1); sa.construct(p); // this is required to be ill-formed // { dg-error "failed: .* uses_allocator is true" "" { target *-*-* } 0 } + // { dg-error "too many initializers for 'X'" "" { target c++2a } 0 } } // Needed because of PR c++/92193 diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc index 423ecc4d90e..6626e5a9713 100644 --- a/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/69293_neg.cc @@ -45,5 +45,6 @@ test01() alloc_type a; std::tuple t(std::allocator_arg, a); // this is required to be ill-formed // { dg-error "failed: .* uses_allocator is true" "" { target *-*-* } 0 } - // { dg-error "no matching function for call" "" { target c++2a } 0 } + // { dg-error "too many initializers for 'X'" "" { target c++2a } 0 } + // { dg-prune-output "in 'constexpr' expansion" } } diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc index c3ff05aa72a..966e579cc99 100644 --- a/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/cons_neg.cc @@ -45,3 +45,4 @@ void test01() } // { dg-error "failed: .* uses_allocator is true" "" { target *-*-* } 0 } // { dg-error "no matching function for call" "" { target c++2a } 0 } +// { dg-prune-output "in 'constexpr' expansion" }