From patchwork Mon Jun 8 19:05:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1305358 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=DGAxmKp0; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 49gjPx6rlXz9sRW for ; Tue, 9 Jun 2020 05:05:41 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 706F73840C08; Mon, 8 Jun 2020 19:05:37 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 32F1C3851C05; Mon, 8 Jun 2020 19:05:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 32F1C3851C05 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=anlauf@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1591643132; bh=Llb9mT2pkGwBJcEkmW8cPzOVkSS8NjvNpTUw7sAQC7s=; h=X-UI-Sender-Class:From:To:Subject:Date; b=DGAxmKp0YM7KnW9fV+qIkRTO3Ik4WQC6VbO39gX9GIq2ut6c2tdO+l3OssEm2WOmB JDDVivh/GRSbipQnXForzsOdx8yCiKIPV5eWxSoQKVpoeAb1BQFVl5LFUE4y34eurI qaCJQV7LgrVTAAdIfsz9BsFyeLDwtQZ9d0GnnJ90= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.84.35] ([93.207.84.35]) by web-mail.gmx.net (3c-app-gmx-bap16.server.lan [172.19.172.86]) (via HTTP); Mon, 8 Jun 2020 21:05:32 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] PR95195 - Fortran testcase should clean up afterwards Date: Mon, 8 Jun 2020 21:05:32 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:T+70jOFcdgvKHiPmbfYTmeUaWIOOngtEa8J89MdtZowXwg1M0rXIp4E3y9nSxa6qd2+g+ XZpffG1AIdANqw1BbO+C+6zcKz2wLbBHLG5/lC9YleRt0SnOl/2JcRJl2fagEiC1kDLbu6bJYomd y5SuTTrdWzYL7k15u8j7cTshU/Es8FWomj9p8xbJItgL85JkZElwzNBE0MeMa+oyZo+yLA8TI67X gTskxrO/aXa0meTlVhZ0q77YVMGRYv87e5Wk5V+onHJTO+BOlS7B5u3m9EPpvw3ay86g6deEr90r lU= X-UI-Out-Filterresults: notjunk:1;V03:K0:dyOFSgcIyFU=:6G5nJlkw2DSDLvmZOkal4w r6Xn+vfIwSGzBSp8Oq6e0Rdvey/xhgBGadshRjop+74QctmfQcmZuHzywM1dOhs8IizZaS1sx eAa4OM13taJvNbIQhYwbOzWNXKicUEcDDC2xraBOOUWI5yhrLCFEYcRNQB/cef2Tf+TlODNdw tTGqR4odBja03hTluUWa8pHOM3HYliI5dtuyT3dxqEi/BL8mnB+RMg25Audwmkv/N/qHUt5Jj XfopT8TWc/JdCGJqQcJ2886URk7ib2H35PdFzyQNukttdUlfrEL7wZfHComvymrd66/yrtnGw oWNgoAJx9GIVhFtgzw+tEePm2H5w5ZQmRKsldh2QkTEMvGkrh7YDxBOdFHn0kKqp7ZVSMfSH9 aFYtHFdNO1HptzMhdsKAjqfacJT7Qx0wgHP8mqS4kilTRpnj44w0LVjuZK2f1pyoz80Gcvym8 g20XKFOWZ9BRTmv6dK3zlSrvjZgQQ5g32pzsP9ZXcSnqOWibJWtqKQe/UphEKAPlbZsIOFkkf NFAbJCs1FHHUDSriU4hRHZdgHHfIRerbYOWbEnVxdZoLu8UzXkhNyye2h+05TjhNWupn2BzEP ab0qRnl8d1qFYgoRq75j8JRLkOrrLPtmbsbCqpbkX0m4TF6rfEwcDQdBIqMajBofMxkBIotuA Wc+Mfap1aU+z0wJl+PDKKCeKY2jI1+ZbsxYXoPzCxyHbZlw== X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" In a parallel make check-fortran there was a race condition due to a file "test.dat" not being cleaned up. Adjust testcase to use a separate filename, and instead of failing catch error message within the program. Committed as obvious. Thanks, Harald PR fortran/95195 - Fortran testcase should clean up afterwards Change testcase to check error message (iomsg) at runtime, rather than to crash. libgfortran/ PR fortran/95091 * io/transfer.c (finalize_transfer): Fix type in error message. gcc/testsuite/ PR fortran/95195 * gfortran.dg/namelist_97.f90: Adjust testcase. diff --git a/gcc/testsuite/gfortran.dg/namelist_97.f90 b/gcc/testsuite/gfortran.dg/namelist_97.f90 index 4907e46b46a..3c6ad7ce3c1 100644 --- a/gcc/testsuite/gfortran.dg/namelist_97.f90 +++ b/gcc/testsuite/gfortran.dg/namelist_97.f90 @@ -1,14 +1,16 @@ ! { dg-do run } -! { dg-output "At line 12 .*" } -! { dg-shouldfail "Fortran runtime error: Namelist formatting .* FORM='UNFORMATTED'" } ! ! PR95195 - improve runtime error when writing a namelist to an unformatted file program test character(len=11) :: my_form = 'unformatted' integer :: i = 1, j = 2, k = 3 + character(80) :: iomsg namelist /nml1/ i, j, k - open (unit=10, file='test.dat', form=my_form) - write (unit=10, nml=nml1) + open (unit=10, file='namelist_97.dat', form=my_form) + write (unit=10, nml=nml1, iostat=iostat, iomsg=iomsg) close (unit=10, status='delete') + if (iostat == 0) stop 1 + if (iomsg /= "Namelist formatting for unit connected with FORM='UNFORMATTED'") & + stop 2 end program test diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index cd51679ff46..dc18bc34b32 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -4127,7 +4127,7 @@ finalize_transfer (st_parameter_dt *dtp) { generate_error (&dtp->common, LIBERROR_OPTION_CONFLICT, "Namelist formatting for unit connected " - "with FORM='UNFORMATTED"); + "with FORM='UNFORMATTED'"); return; }