From 7b72c0d4a053f64c1ac1f1c2eb846aafe56a0a83 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Tue, 21 Jan 2020 11:20:45 -0800 Subject: [PATCH] Fix line terminator pattern in testcase. I observed this testcase was failing on nios2-elf. The more general regexp was copied from other tests using dg-output. 2020-01-21 Sandra Loosemore gcc/testsuite/ * g++.dg/coroutines/torture/mid-suspend-destruction-0.C: Generalize line terminators in patterns. --- gcc/testsuite/ChangeLog | 5 +++++ .../g++.dg/coroutines/torture/mid-suspend-destruction-0.C | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4bea57e3968..b164f3156c7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-01-21 Sandra Loosemore + + * g++.dg/coroutines/torture/mid-suspend-destruction-0.C: Generalize + line terminators in patterns. + 2020-01-21 Richard Sandiford * gcc.target/aarch64/sve/acle/general-c/load_1.c (f1): Cast to 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 934fb19de7d..505bfa33662 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" } -// { dg-output "Destroyed coro1\n" } -// { dg-output "Destroyed suspend_always_prt\n" } -// { dg-output "Destroyed Promise\n" } +// { 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)" } // Check that we still get the right DTORs run when we let a suspended coro // go out of scope. -- 2.30.2