From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id A99873858D32; Sat, 21 Jan 2023 23:59:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A99873858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x429.google.com with SMTP id c85so6446628pfc.8; Sat, 21 Jan 2023 15:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Z1mDeK2Mst9k+MSWHIbnRmx3POtw1vMxmMIjZYY0lcY=; b=qF5DQ85aWPVfxh+8csvi23uoXtb2Wk5qxJidA7Z6Tk+jCoLy80L62CYlASRBprJzTs gpvYfHyItzZwY21w1u6+W89qnlFPgD4rhPTRPxwI14p6RlukGQm4xUaJcU3YfJNd2tt1 Zach3rEWO2fj5LjiwjDDl9lo8vkVjmP1i2MZGoZvUURHgf4ST+ZYaR3UHudLB8FE/wQm dgDztWKqluBMlJi1u9gmfmGyEG5j+8Ckwp5oOLHD1WAeWAdxIkntDUoV4EsxTWZWZp36 yjBSwJfEwlG04zF0zEVLpi8G0C/q6QVA4ex40IKVzDUIQVeh/QWZW/uEN7OiEN3kiC2X K+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z1mDeK2Mst9k+MSWHIbnRmx3POtw1vMxmMIjZYY0lcY=; b=sVx6ngnKbc6W0mhNiBCHrX98F3x9jgCguUf9wBoBPm3/cjvvvZ+jsPTzzR26YDUKIs I9AAmwLWqjwgMMaKotivlMlSpiwuj/exUwVKctODVFKIrKLAQLP7MC4xKScgzr3pmnfq E0JRaOOUR+N8waDMo1p/N+SCLftW6asXc0K9WohJWwXMVyfg1HengULVuDFrUC4bmY+M GHb8XbBoZ8WO7tXdopOOPn49aBDhz8smUBFwD3jFPOGC4ZnysIqx8GrYYWutVz51GApZ /KtqEbzWFywoIpQ/LV4m/M3uCVmNtLhmurOXLajEFZm63FPIvokiiM20/XZTMJS7mCC0 8iiQ== X-Gm-Message-State: AFqh2krGXbPNjWjU91dbyvx4Yu9WoZ8njz4mRNnexNxrj3EkSnefsFnX C2txFIpZlDJokjZTcQID7Mc= X-Google-Smtp-Source: AMrXdXuyIaL9y79fOrsanG8Wje3fyByuhKphcY0EA/ma3YPk4jN0MfirJagolbLB74gTnUR7IE5qEw== X-Received: by 2002:aa7:9ad9:0:b0:582:4a5e:b1ec with SMTP id x25-20020aa79ad9000000b005824a5eb1ecmr4627266pfp.2.1674345548688; Sat, 21 Jan 2023 15:59:08 -0800 (PST) Received: from [192.168.1.20] ([50.37.188.226]) by smtp.gmail.com with ESMTPSA id b5-20020a62cf05000000b005821db4fd84sm15942727pfg.131.2023.01.21.15.59.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Jan 2023 15:59:08 -0800 (PST) Message-ID: Date: Sat, 21 Jan 2023 15:59:07 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [patch, gfortran.dg] Adjust numerous tests so that they pass on line endings Content-Language: en-US To: Jerry DeLisle , gfortran Cc: gcc-patches References: <1f4144a4-5920-4286-5ad6-f4587498c8eb@protonmail.com> From: Jerry D In-Reply-To: <1f4144a4-5920-4286-5ad6-f4587498c8eb@protonmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 1/20/23 6:13 PM, Jerry DeLisle via Fortran wrote: > Hi all, > > The attached patch modifies the following tests to check for line > endings. Some test environments inject superfluous /r characters at > ends of lines. The expression matching in dg-output tests are changed from: > > (\n|\r\n|\r) > > to > > (\r*\n+) > > This allows these tests to pass. The failing tests tend to mask the real > bugs in these systems. > > The changes were provided by Nightstrike who has tested on the > troublesome environment. I ran the tests successfully on Linux. I do not > know if anyone has tested on Mac or some of the other system that use > odd line endings. > > OK for trunk? What about for 12? > > Regards, > > Jerry > > modified: gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 > modified: gcc/testsuite/gfortran.dg/array_temporaries_2.f90 > modified: gcc/testsuite/gfortran.dg/bind-c-contiguous-1.f90 > modified: gcc/testsuite/gfortran.dg/bind-c-contiguous-4.f90 > modified: gcc/testsuite/gfortran.dg/bind-c-contiguous-5.f90 > modified: gcc/testsuite/gfortran.dg/fmt_error_4.f90 > modified: gcc/testsuite/gfortran.dg/fmt_error_5.f90 > modified: gcc/testsuite/gfortran.dg/fmt_float.f90 > modified: gcc/testsuite/gfortran.dg/fmt_l.f90 > modified: gcc/testsuite/gfortran.dg/fmt_nonchar_2.f90 > modified: gcc/testsuite/gfortran.dg/fmt_zero_precision.f90 > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-apostrophe-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-colon-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-h-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-i-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-slash-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f > modified: gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f > modified: gcc/testsuite/gfortran.dg/namelist_40.f90 > modified: gcc/testsuite/gfortran.dg/namelist_47.f90 > modified: gcc/testsuite/gfortran.dg/namelist_print_1.f > modified: gcc/testsuite/gfortran.dg/parameter_array_dummy.f90 Proposed ChangeLog entry using git gcc-commit-mklog: Author: Jerry DeLisle Date: Sat Jan 21 15:47:19 2023 -0800 Revise the line end tests to pass on certain windows test environments which inject spurious /r characters. Adjust (\n|\r\n|\r) to (\r*\n+). gcc/testsuite/ChangeLog: * gfortran.dg/ISO_Fortran_binding_17.f90: As noted above. * gfortran.dg/array_temporaries_2.f90: As noted above. * gfortran.dg/bind-c-contiguous-1.f90: As noted above. * gfortran.dg/bind-c-contiguous-4.f90: As noted above. * gfortran.dg/bind-c-contiguous-5.f90: As noted above. * gfortran.dg/fmt_error_4.f90: As noted above. * gfortran.dg/fmt_error_5.f90: As noted above. * gfortran.dg/fmt_float.f90: As noted above. * gfortran.dg/fmt_l.f90: As noted above. * gfortran.dg/fmt_nonchar_2.f90: As noted above. * gfortran.dg/fmt_zero_precision.f90: As noted above. * gfortran.dg/g77/f77-edit-apostrophe-out.f: As noted above. * gfortran.dg/g77/f77-edit-colon-out.f: As noted above. * gfortran.dg/g77/f77-edit-h-out.f: As noted above. * gfortran.dg/g77/f77-edit-i-out.f: As noted above. * gfortran.dg/g77/f77-edit-s-out.f: As noted above. * gfortran.dg/g77/f77-edit-slash-out.f: As noted above. * gfortran.dg/g77/f77-edit-t-out.f: As noted above. * gfortran.dg/g77/f77-edit-x-out.f: As noted above. * gfortran.dg/namelist_40.f90: As noted above. * gfortran.dg/namelist_47.f90: As noted above. * gfortran.dg/namelist_print_1.f: As noted above. * gfortran.dg/parameter_array_dummy.f90: As noted above.