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 <jvdeli...@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.
