public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] test predicate output Date: Fri, 4 Nov 2022 14:09:07 +0000 (GMT) [thread overview] Message-ID: <20221104140907.7D71C38555A0@sourceware.org> (raw) https://gcc.gnu.org/g:a01c9dfe60764a346ddd82d66d19488d5e9d7927 commit a01c9dfe60764a346ddd82d66d19488d5e9d7927 Author: Jason Merrill <jason@redhat.com> 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<int, .*(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .*(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* t > 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* s > 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* r > 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<int, .*(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .*(\n|\r\n|\r)*" } -// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* t > 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* s > 0 .*(\n|\r\n|\r)*" } +// { dg-output "default std::handle_contract_violation called: .*.C 10 G5<int, .* r > 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 <iostream> #include <experimental/contract> -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" }
reply other threads:[~2022-11-04 14:09 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221104140907.7D71C38555A0@sourceware.org \ --to=jason@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).