From patchwork Fri Sep 3 13:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1524326 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1Jc72BXFz9sCD for ; Fri, 3 Sep 2021 23:31:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C54E23848423 for ; Fri, 3 Sep 2021 13:31:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 5115A384A021 for ; Fri, 3 Sep 2021 13:29:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5115A384A021 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: 0gLX28d32uYDIvgO/f0/OYkYE6eqOdDriaetZEtzIqtRiLQq21Ruu3nqoLnlYSBeT+n+C2E5X4 A/QY4ll4PSKTxQHXO4voQZS/DKO/To0Flhl94W2gJUOK9tmafR9c66s8NMku3+QO2xBRo1+Cj/ lXW0cUNJ6TwzOVBAz7r3J3QlogtW6igTejCUwaRE9cGRaTEwHRf2YhyqvRRmEMiyVUFYatt8Ru ZzmWqd4lCaLRVhQsQXMQTuNL0+oj/45cW4c/t4k4TWTeJOISlqXHAJzcej3kEPAkGEXroyX2VU YlkRIVM/7jgKvEdqR1umCQJj X-IronPort-AV: E=Sophos;i="5.85,265,1624348800"; d="diff'?scan'208";a="65474014" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 03 Sep 2021 05:29:15 -0800 IronPort-SDR: K0W+A9iibNFxli1slRz2GWnchFCkiplHkvqTszyX7CCdCwE3JeTjN+Gw/h43yFXoDKW5Fplb/K mn8u24ZHT1c3BmS3QZ4hCGIbTc9+R4VR+rw/DYnVUsW4KoJ8bxwMMH+HOGzKyamCmByyJ+07o1 zqcMeOJYScbojY4yjjabARJTH/1/y1lSJuO4AcEVuUm4YqNeTEpdyDA4qGs9kODxAfYvThyL9q 4PJqJfVrCKd0jgwLyxPnp9wb72YvjAoRNGUmlqfwzNKMV6OkN5wOv99xfYzz8Jo9jek0CWfVvG ZiE= To: gcc-patches From: Tobias Burnus Subject: [committed] libgomp.*/error-1.{c,f90}: Fix dg-output newline pattern Message-ID: Date: Fri, 3 Sep 2021 15:29:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Fixes the testcase for \r\n line breaks → r12-3327-g4ce90454c2c81246be993d997cab12e21bc0be68 Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 commit 4ce90454c2c81246be993d997cab12e21bc0be68 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 --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)" }