From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16897 invoked by alias); 16 Apr 2019 15:57:38 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 16884 invoked by uid 89); 16 Apr 2019 15:57:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.4 required=5.0 tests=BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=16042019, 16.04.2019, msys2, H*F:U*rainer X-HELO: mout.kundenserver.de Received: from mout.kundenserver.de (HELO mout.kundenserver.de) (217.72.192.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 16 Apr 2019 15:57:36 +0000 Received: from addc1.ad.local.emrich-ebersheim.de ([24.134.13.209]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MtfVx-1gzzL52vvj-00v6Uu; Tue, 16 Apr 2019 17:57:28 +0200 Received: from localhost (localhost [127.0.0.1]) by addc1.ad.local.emrich-ebersheim.de (Postfix) with ESMTP id BB9C5282853; Tue, 16 Apr 2019 17:57:25 +0200 (CEST) Received: from addc1.ad.local.emrich-ebersheim.de ([127.0.0.1]) by localhost (addc1.ad.local.emrich-ebersheim.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hpX6Th3vPrC5; Tue, 16 Apr 2019 17:57:24 +0200 (CEST) Received: from [IPv6:2a02:8106:22a:130d:f527:c8be:68d:baaa] (unknown [IPv6:2a02:8106:22a:130d:f527:c8be:68d:baaa]) by addc1.ad.local.emrich-ebersheim.de (Postfix) with ESMTPS id 3E0BC28015E; Tue, 16 Apr 2019 17:57:24 +0200 (CEST) Subject: Re: dg-extract-results broken since rev 268511, was Re: Status of 9.0.1 20190415 [trunk revision 270358] on x86_64-w64-mingw32 To: Jakub Jelinek , Christophe Lyon , David Malcolm Cc: gcc Mailing List References: <20190415153842.GU21066@tucnak> <34226dcf-24e4-370f-0f88-a69d979aef2e@emrich-ebersheim.de> <97c67265-af2a-b3f2-eecc-168abf4b5a6c@emrich-ebersheim.de> <8baf303a-9f01-15ec-7bbc-7b3419a96f00@emrich-ebersheim.de> <782fe033-0797-5574-0d62-af3ab4bf881e@emrich-ebersheim.de> <504c2014-9764-c638-bf3a-0802132eb475@emrich-ebersheim.de> <20190416134444.GH21066@tucnak> <20190416153611.GI21066@tucnak> From: Rainer Emrich Openpgp: url=random.sks.keyserver.penguin.de Message-ID: <89a330db-fda6-3170-c70d-8e78c69a6794@emrich-ebersheim.de> Date: Tue, 16 Apr 2019 15:57:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190416153611.GI21066@tucnak> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Hwb9KPD4h01u2vMs5hfGUdc1RnXdcFZPj" X-SW-Source: 2019-04/txt/msg00176.txt.bz2 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Hwb9KPD4h01u2vMs5hfGUdc1RnXdcFZPj Content-Type: multipart/mixed; boundary="F7nw5lahnxU2Rm5LEfgTaVDtM9wcxPtvZ"; protected-headers="v1" From: Rainer Emrich To: Jakub Jelinek , Christophe Lyon , David Malcolm Cc: gcc Mailing List Message-ID: <89a330db-fda6-3170-c70d-8e78c69a6794@emrich-ebersheim.de> Subject: Re: dg-extract-results broken since rev 268511, was Re: Status of 9.0.1 20190415 [trunk revision 270358] on x86_64-w64-mingw32 References: <20190415153842.GU21066@tucnak> <34226dcf-24e4-370f-0f88-a69d979aef2e@emrich-ebersheim.de> <97c67265-af2a-b3f2-eecc-168abf4b5a6c@emrich-ebersheim.de> <8baf303a-9f01-15ec-7bbc-7b3419a96f00@emrich-ebersheim.de> <782fe033-0797-5574-0d62-af3ab4bf881e@emrich-ebersheim.de> <504c2014-9764-c638-bf3a-0802132eb475@emrich-ebersheim.de> <20190416134444.GH21066@tucnak> <20190416153611.GI21066@tucnak> In-Reply-To: <20190416153611.GI21066@tucnak> --F7nw5lahnxU2Rm5LEfgTaVDtM9wcxPtvZ Content-Type: text/plain; charset=utf-8 Content-Language: de-DE Content-Transfer-Encoding: quoted-printable Content-length: 3569 Am 16.04.2019 um 17:36 schrieb Jakub Jelinek: > On Tue, Apr 16, 2019 at 03:44:44PM +0200, Jakub Jelinek wrote: >> I can't reproduce this on my Fedora 29 x86_64-linux bootstrap box though, >> the *.log files are complete there. >> >> And I have no idea if it was introduced with your change or earlier. >=20 > Actually, I managed to reproduce in a Fedora 31 chroot, in which I don't > have /usr/bin/python installed (I think in Fedora 30+ there is > /usr/bin/python2 and /usr/bin/python3 but not /usr/bin/python, at least n= ot > in the default buildroot). On msys2 there is no python executable but /usr/bin/python2. Optionally you may install python3. >=20 > The changes to contrib/dg-extract-results.sh look wrong to me: > --- contrib/dg-extract-results.sh 2018-04-25 09:40:40.139659386 +0200 > +++ contrib/dg-extract-results.sh 2019-03-05 21:49:34.471573434 +0100 > @@ -298,6 +298,8 @@ BEGIN { > cnt=3D0 > print_using=3D0 > need_close=3D0 > + has_timeout=3D0 > + timeout_cnt=3D0 > } > /^EXPFILE: / { > expfiles[expfileno] =3D \$2 > @@ -329,16 +331,37 @@ BEGIN { > # Ugly hack for gfortran.dg/dg.exp > if ("$TOOL" =3D=3D "gfortran" && testname ~ /^gfortran.dg\/g77\//) > testname=3D"h"testname > + if (\$1 =3D=3D "WARNING:" && \$2 =3D=3D "program" && \$3 =3D=3D "timed= " && (\$4 =3D=3D "out" || \$4 =3D=3D "out.")) { > + has_timeout=3D1 > + timeout_cnt=3Dcnt > + } else { > + # Prepare timeout replacement message in case it's needed > + timeout_msg=3D\$0 > + sub(\$1, "WARNING:", timeout_msg) > + } > } > /^$/ { if ("$MODE" =3D=3D "sum") next } > { if (variant =3D=3D curvar && curfile) { > if ("$MODE" =3D=3D "sum") { > - printf "%s %08d|", testname, cnt >> curfile > - cnt =3D cnt + 1 > + # Do not print anything if the current line is a timeout > + if (has_timeout =3D=3D 0) { > + # If the previous line was a timeout, > + # insert the full current message without keyword > + if (timeout_cnt !=3D 0) { > + printf "%s %08d|%s program timed out.\n", testname, timeout_cn= t, timeout_msg >> curfile > + timeout_cnt =3D 0 > + cnt =3D cnt + 1 > + } > + printf "%s %08d|", testname, cnt >> curfile > + cnt =3D cnt + 1 > + filewritten[curfile]=3D1 > + need_close=3D1 > + if (timeout_cnt =3D=3D 0) > + print >> curfile > + } > + > + has_timeout=3D0 > } > - filewritten[curfile]=3D1 > - need_close=3D1 > - print >> curfile > } else > next > } > First of all, I don't see why the WARNING: program timed out > stuff should be handled in any way specially in -L mode, there is no sort= ing > at all and all the lines go together. But more importantly, the above > changes broke completely the -L mode, previously the filewritten, need_cl= ose > and print lines were done for both sum and log modes, but now they are do= ne > only in the sum mode (and in that case only if has_timeout is 0, which is > desirable). >=20 > I believe the following patch should fix it, but I don't actually have any > WARNING: program timed out > lines in my *.sep files in any of the last 12 bootstraps I have around. I do have several "program timed out" in libgomp, so I may test this. >=20 > Additionally, perhaps we should change dg-extract-results.sh, so that it > doesn't try just python, but also python3? I think in some distros > /usr/bin/python even warns users that they should decide if they mean > python2 or python3. As explained above I vote for this change. --F7nw5lahnxU2Rm5LEfgTaVDtM9wcxPtvZ-- --Hwb9KPD4h01u2vMs5hfGUdc1RnXdcFZPj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" Content-length: 833 -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEQq4BT9NfW50eSlCTkX2ILOIqatIFAly1+14ACgkQkX2ILOIq atKZRg//S8P0KYSzlCGMLr7Z5dGdH4laUecQcI2ht18kVmACarCsFEpv9PEAtRTY 50OtTI9htFK+8ryC4qsfMCRfESitxjEEgC4Mx8jroIdj0+QCI0jgNyVm8xjCIC0W hlm39rIXiwTWE6pkOzdEYZ4QiW/wxADFL6OxVDOEnaRTRHBXlwkgVd/3kSnCM0mZ itB5w+VK5Zr7kM8r/r8w5NQhcKp5/WFGe3Vq1jRBbZ+dtPre8avh1LILf9eQITp8 /d5jsKYatBbe/+qLoytRwUsbhUDDeP4yA5QcB7jEJxhdLBBDaUYVkdg4TcDgs2+U dZQ5V2sT4YfOU0nJO0HSBZ3d1Hxf30DvWwJjsvVjuJy0ykOKpKXhrTr8oV4TJHJU msrMTHsk/MJcSraBRaz4LLKhK7vzSyHd6NQlHNriXYmZMgLbY8KcpIbW1lsAvLDT HtJerHYZ9iw0Afd34+kKcF8YHdM102pKSbUn3901+9tuyAlDGlp99S4tPE8kFxx0 gWe4FIIKbreqUnavckeQVlFfac0vegJgA8PJOz6PkIrYQRLipkDP9Ei1SglQ7aoN 9+uz53od317jb82lLWuiZZVhTpvXA1+k00n2bUToJj9m4mJWVHACpXr/7nvTI4nu fja+Wtd7199uxqcqs4RqgmPks+8VCHJz6BnRIj16LJx0dTzV82c= =SJIh -----END PGP SIGNATURE----- --Hwb9KPD4h01u2vMs5hfGUdc1RnXdcFZPj--