From fdaa3e69d26de7c62b7445be83f612834ee38d7c Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 3 Sep 2021 15:30:56 +0200 Subject: [PATCH] libgomp.*/error-1.{c,f90}: Fix dg-output newline pattern libgomp/ChangeLog: * testsuite/libgomp.c-c++-common/error-1.c: Use \r\n not \n\r in dg-output. * testsuite/libgomp.fortran/error-1.f90: Likewise. (cherry picked from commit 4ce90454c2c81246be993d997cab12e21bc0be68) --- libgomp/ChangeLog.omp | 9 +++++++ .../testsuite/libgomp.c-c++-common/error-1.c | 6 ++--- libgomp/testsuite/libgomp.fortran/error-1.f90 | 24 +++++++++---------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 34c717d62175..8e702a4dbd1b 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,12 @@ +2021-08-03 Tobias Burnus + + Backported from master: + 2021-09-03 Tobias Burnus + + * testsuite/libgomp.c-c++-common/error-1.c: Use \r\n not \n\r in + dg-output. + * testsuite/libgomp.fortran/error-1.f90: Likewise. + 2021-08-23 Tobias Burnus Backported from master: diff --git a/libgomp/testsuite/libgomp.c-c++-common/error-1.c b/libgomp/testsuite/libgomp.c-c++-common/error-1.c index 04c0519bf633..e7f550ae7014 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/error-1.c +++ b/libgomp/testsuite/libgomp.c-c++-common/error-1.c @@ -53,7 +53,7 @@ main () return 0; } -/* { dg-output "libgomp: error directive encountered(\n|\r|\n\r)(\n|\r|\n\r)" } */ -/* { dg-output "libgomp: error directive encountered: message(\n|\r|\n\r)(\n|\r|\n\r)" } */ -/* { dg-output "libgomp: error directive encountered: hello from a distance(\n|\r|\n\r)(\n|\r|\n\r)" } */ +/* { dg-output "libgomp: error directive encountered(\n|\r|\r\n)(\n|\r|\r\n)" } */ +/* { dg-output "libgomp: error directive encountered: message(\n|\r|\r\n)(\n|\r|\r\n)" } */ +/* { dg-output "libgomp: error directive encountered: hello from a distance(\n|\r|\r\n)(\n|\r|\r\n)" } */ /* { dg-output "libgomp: fatal error: error directive encountered: my message" } */ diff --git a/libgomp/testsuite/libgomp.fortran/error-1.f90 b/libgomp/testsuite/libgomp.fortran/error-1.f90 index 7c497fd002ed..ee3222d88946 100644 --- a/libgomp/testsuite/libgomp.fortran/error-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/error-1.f90 @@ -73,15 +73,15 @@ contains end subroutine end -! { dg-output "(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: Polonius(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: Laertes(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: Paris(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: To thine own self be true(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: message(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: Farewell(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: from a distance(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: Hello World(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: error directive encountered: mes(\n|\r|\n\r)(\n|\r|\n\r)" } -! { dg-output "libgomp: fatal error: error directive encountered: my message (\n|\r|\n\r)" } +! { dg-output "(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: Polonius(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: Laertes(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: Paris(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: To thine own self be true(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: message(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: Farewell(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: from a distance(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: Hello World(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: error directive encountered: mes(\n|\r|\r\n)(\n|\r|\r\n)" } +! { dg-output "libgomp: fatal error: error directive encountered: my message (\n|\r|\r\n)" } -- 2.47.2