diff mbox series

Simplify \r handling

Message ID 243399d5-5ec5-4554-9f73-c23dc64969db@gmail.com
State New
Headers show
Series Simplify \r handling | expand

Commit Message

Jonathan Yong March 31, 2024, 5:42 a.m. UTC 
Simplify \r checking with regex globs.

Signed-off-by: Jonathan Yong <10walls@gmail.com>

         gcc/testsuite
         * g++.dg/contracts/contracts14.C: simplify \r regex.
         * g++.dg/contracts/contracts15.C: ditto
         * g++.dg/contracts/contracts16.C: ditto
         * g++.dg/coroutines/torture/mid-suspend-destruction-0.C: ditto
---
  gcc/testsuite/g++.dg/contracts/contracts14.C         | 12 ++++++------
  gcc/testsuite/g++.dg/contracts/contracts15.C         |  8 ++++----
  gcc/testsuite/g++.dg/contracts/contracts16.C         |  4 ++--
  .../coroutines/torture/mid-suspend-destruction-0.C   |  8 ++++----
  4 files changed, 16 insertions(+), 16 deletions(-)

Attached patch Okay?
diff mbox series

Patch

From b64524632e236b2476d5eced8315c2ba8bece315 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Sun, 11 Feb 2024 09:26:20 +0000
Subject: [PATCH] Simplify \r handling

Simplify \r checking with regex globs.

Signed-off-by: Jonathan Yong <10walls@gmail.com>

	gcc/testsuite
	* g++.dg/contracts/contracts14.C: simplify \r regex.
	* g++.dg/contracts/contracts15.C: ditto
	* g++.dg/contracts/contracts16.C: ditto
	* g++.dg/coroutines/torture/mid-suspend-destruction-0.C: ditto
---
 gcc/testsuite/g++.dg/contracts/contracts14.C         | 12 ++++++------
 gcc/testsuite/g++.dg/contracts/contracts15.C         |  8 ++++----
 gcc/testsuite/g++.dg/contracts/contracts16.C         |  4 ++--
 .../coroutines/torture/mid-suspend-destruction-0.C   |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gcc/testsuite/g++.dg/contracts/contracts14.C b/gcc/testsuite/g++.dg/contracts/contracts14.C
index d9156d6875d..fb2884b8cb2 100644
--- a/gcc/testsuite/g++.dg/contracts/contracts14.C
+++ b/gcc/testsuite/g++.dg/contracts/contracts14.C
@@ -48,11 +48,11 @@  int main(int, char**) {
   return 0;
 }
 
-// { dg-output "custom std::handle_contract_violation called: 30 .*/contracts14.C(\n|\r\n|\r)" }
-// { dg-output "synth caught direct: -30(\n|\r\n|\r)" }
-// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts14.C(\n|\r\n|\r)" }
-// { dg-output "synth caught indirect: -18(\n|\r\n|\r)" }
-// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts14.C(\n|\r\n|\r)" }
-// { dg-output "synth caught double indirect: -18(\n|\r\n|\r)" }
+// { dg-output "custom std::handle_contract_violation called: 30 .*/contracts14.C\r*\n+" }
+// { dg-output "synth caught direct: -30\r*\n+" }
+// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts14.C\r*\n+" }
+// { dg-output "synth caught indirect: -18\r*\n+" }
+// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts14.C\r*\n+" }
+// { dg-output "synth caught double indirect: -18\r*\n+" }
 // { dg-output "end main" }
 
diff --git a/gcc/testsuite/g++.dg/contracts/contracts15.C b/gcc/testsuite/g++.dg/contracts/contracts15.C
index ef52a0e67f0..58db940518a 100644
--- a/gcc/testsuite/g++.dg/contracts/contracts15.C
+++ b/gcc/testsuite/g++.dg/contracts/contracts15.C
@@ -48,9 +48,9 @@  int main(int, char**) {
   return 0;
 }
 
-// { 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-output "custom std::handle_contract_violation called: 30 .*/contracts15.C\r*\n+" }
+// { dg-output "synth caught direct: -30\r*\n+" }
+// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts15.C\r*\n+" }
+// { dg-output "terminate called after throwing an instance of .int.\r*\n+" }
 // { dg-shouldfail "throwing in noexcept" }
 
diff --git a/gcc/testsuite/g++.dg/contracts/contracts16.C b/gcc/testsuite/g++.dg/contracts/contracts16.C
index 5d58ab8eaa1..9e1688ba51b 100644
--- a/gcc/testsuite/g++.dg/contracts/contracts16.C
+++ b/gcc/testsuite/g++.dg/contracts/contracts16.C
@@ -29,6 +29,6 @@  int main(int, char**) {
   return 0;
 }
 
-// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts16.C(\n|\r\n|\r)" }
-// { dg-output "synth caught indirect: -18(\n|\r\n|\r)" }
+// { dg-output "custom std::handle_contract_violation called: 18 .*/contracts16.C\r*\n+" }
+// { dg-output "synth caught indirect: -18\r*\n+" }
 
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C b/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
index 0cbf93ad8af..00d6d58c3b1 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
@@ -1,8 +1,8 @@ 
 // { dg-do run }
-// { dg-output "main: returning(\n|\r\n|\r)" }
-// { dg-output "Destroyed coro1(\n|\r\n|\r)" }
-// { dg-output "Destroyed suspend_always_prt(\n|\r\n|\r)" }
-// { dg-output "Destroyed Promise(\n|\r\n|\r)" }
+// { dg-output "main: returning\r*\n+" }
+// { dg-output "Destroyed coro1\r*\n+" }
+// { dg-output "Destroyed suspend_always_prt\r*\n+" }
+// { dg-output "Destroyed Promise\r*\n+" }
 
 // Check that we still get the right DTORs run when we let a suspended coro
 // go out of scope.
-- 
2.44.0