From: Jerry D <jvdelisle2@gmail.com>
To: Jerry DeLisle <jvdelisle@protonmail.com>, gfortran <fortran@gcc.gnu.org>
Cc: gcc-patches <gcc-patches@gcc.gnu.org>
Subject: Re: [patch, gfortran.dg] Adjust numerous tests so that they pass on line endings
Date: Sat, 21 Jan 2023 15:59:07 -0800 [thread overview]
Message-ID: <c876c113-da4c-a70f-172f-0824018bf8ea@gmail.com> (raw)
In-Reply-To: <1f4144a4-5920-4286-5ad6-f4587498c8eb@protonmail.com>
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 <jvdelisle@gcc.gnu.org>
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.
next prev parent reply other threads:[~2023-01-21 23:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-21 2:13 Jerry DeLisle
2023-01-21 23:59 ` Jerry D [this message]
2023-01-22 5:28 ` NightStrike
2023-01-22 13:38 ` Mikael Morin
2023-01-22 16:06 ` Jerry D
2023-01-28 2:47 ` Jerry D
2023-01-28 16:44 ` Mikael Morin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c876c113-da4c-a70f-172f-0824018bf8ea@gmail.com \
--to=jvdelisle2@gmail.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jvdelisle@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).