From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id AE38D384A07D; Fri, 3 Sep 2021 13:27:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE38D384A07D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3327] libgomp.*/error-1.{c, f90}: Fix dg-output newline pattern X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: 8d34ffb4e8ed5300d0276b55f573add6db2517e8 X-Git-Newrev: 4ce90454c2c81246be993d997cab12e21bc0be68 Message-Id: <20210903132735.AE38D384A07D@sourceware.org> Date: Fri, 3 Sep 2021 13:27:35 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 13:27:35 -0000 https://gcc.gnu.org/g:4ce90454c2c81246be993d997cab12e21bc0be68 commit r12-3327-g4ce90454c2c81246be993d997cab12e21bc0be68 Author: Tobias Burnus Date: Fri Sep 3 15:24:41 2021 +0200 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. Diff: --- libgomp/testsuite/libgomp.c-c++-common/error-1.c | 6 +++--- libgomp/testsuite/libgomp.fortran/error-1.f90 | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libgomp/testsuite/libgomp.c-c++-common/error-1.c b/libgomp/testsuite/libgomp.c-c++-common/error-1.c index 04c0519bf63..e7f550ae701 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 7c497fd002e..ee3222d8894 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)" }