From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 7D71C38555A0; Fri, 4 Nov 2022 14:09:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D71C38555A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570947; bh=dtehoA7OazDSJ0WOpNpis010Vgf7aUOEEvsWCF5FFaQ=; h=From:To:Subject:Date:From; b=aozXoxCgcajhtinZ7URz2HkpkpkA1Ok9/zfEF1mh72PlhuozO9lD4HPuOeEZio5D9 t32ZT4mSXkBPqiLdtV3wH0ess+RwHYX2bVjT/KzqIYeYDavw3Ezevcr9+ieQUnmqoU 82PtlCP3XxRRa5ducK6K3mzszPpId/Abc/F7UXts= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] test predicate output X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: 7817afdb87b92fa3013e4a622ee0a781970ba9b3 X-Git-Newrev: a01c9dfe60764a346ddd82d66d19488d5e9d7927 Message-Id: <20221104140907.7D71C38555A0@sourceware.org> Date: Fri, 4 Nov 2022 14:09:07 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a01c9dfe60764a346ddd82d66d19488d5e9d7927 commit a01c9dfe60764a346ddd82d66d19488d5e9d7927 Author: Jason Merrill Date: Fri Nov 4 09:47:56 2022 -0400 test predicate output Diff: --- gcc/testsuite/g++.dg/contracts/contracts-multiline1.C | 2 +- gcc/testsuite/g++.dg/contracts/contracts-tmpl-spec3.C | 12 ++++++------ gcc/testsuite/g++.dg/contracts/contracts15.C | 16 +++------------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gcc/testsuite/g++.dg/contracts/contracts-multiline1.C b/gcc/testsuite/g++.dg/contracts/contracts-multiline1.C index e07c4a94d9a..8145c61e827 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts-multiline1.C +++ b/gcc/testsuite/g++.dg/contracts/contracts-multiline1.C @@ -16,4 +16,4 @@ int main(int, char **) ]]; } -// { dg-output "default std::handle_contract_violation called: .*.C 8 main x.*10.*y.*123.*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 8 main x < 10 && y > 123.*(\n|\r\n|\r)*" } diff --git a/gcc/testsuite/g++.dg/contracts/contracts-tmpl-spec3.C b/gcc/testsuite/g++.dg/contracts/contracts-tmpl-spec3.C index 879172f1513..44725893061 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts-tmpl-spec3.C +++ b/gcc/testsuite/g++.dg/contracts/contracts-tmpl-spec3.C @@ -34,12 +34,12 @@ int main(int, char**) { // { dg-output "G5 full double double, f gen R(\n|\r\n|\r)*" } // { dg-output "G5 full double double, f gen R(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } // { dg-output "G5 gen T S, f gen R(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5 0 .*(\n|\r\n|\r)*" } // { dg-output "G5 gen T S, f gen R(\n|\r\n|\r)*" } diff --git a/gcc/testsuite/g++.dg/contracts/contracts15.C b/gcc/testsuite/g++.dg/contracts/contracts15.C index 35bb5223a70..d822f833916 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts15.C +++ b/gcc/testsuite/g++.dg/contracts/contracts15.C @@ -5,16 +5,6 @@ #include #include -int -__on_contract_violation (bool continue_, - int line_number, - const char * file_name, - const char * function_name, - const char * comment, - const char * assertion_level, - const char * assertion_role, - int continuation_mode); - void handle_contract_violation(const std::experimental::contract_violation &violation) { std::cerr << "custom std::handle_contract_violation called:" << " " << violation.line_number() @@ -58,9 +48,9 @@ int main(int, char**) { return 0; } -// { dg-output "custom std::handle_contract_violation called: 40 .*/contracts15.C(\n|\r\n|\r)*" } -// { dg-output "synth caught direct: -40(\n|\r\n|\r)*" } -// { dg-output "custom std::handle_contract_violation called: 28 .*/contracts15.C(\n|\r\n|\r)*" } +// { dg-output "custom std::handle_contract_violation called: 30 .*/contracts15.C(\n|\r\n|\r)*" } +// { dg-output "synth caught direct: -30(\n|\r\n|\r)*" } +// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts15.C(\n|\r\n|\r)*" } // { dg-output "terminate called after throwing an instance of .int.(\n|\r\n|\r)*" } // { dg-shouldfail "throwing in noexcept" }