From 7b27fa7650d5e3b6789ce343e417d18ea9f8640e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sat, 10 May 2008 20:32:40 +0000 Subject: [PATCH] fmt_t_5.f90: Take care of Windows CRLF line terminator. * gfortran.dg/fmt_t_5.f90: Take care of Windows CRLF line terminator. From-SVN: r135160 --- gcc/testsuite/ChangeLog | 8 +++++--- gcc/testsuite/gfortran.dg/fmt_t_5.f90 | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 06bfdf40277..8b29d7c98b4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,17 +1,19 @@ -<<<<<<< .mine +2008-05-10 Francois-Xavier Coudert + + * gfortran.dg/fmt_t_5.f90: Take care of Windows CRLF line + terminator. + 2008-05-10 Kenneth Zadeck PR rtl-optimization/36185 * g++.dg/opt/pr36185.C -======= 2008-05-10 Francois-Xavier Coudert * write_to_null.f90: Rename to write_to_null.F90. * write_to_null.F90: On Windows, "nul" is the equivalent of the Unix /dev/null. ->>>>>>> .r135158 2008-05-10 Richard Sandiford PR rtl-optimization/33642 diff --git a/gcc/testsuite/gfortran.dg/fmt_t_5.f90 b/gcc/testsuite/gfortran.dg/fmt_t_5.f90 index c472e89b19c..0c27b6aa3eb 100644 --- a/gcc/testsuite/gfortran.dg/fmt_t_5.f90 +++ b/gcc/testsuite/gfortran.dg/fmt_t_5.f90 @@ -12,7 +12,7 @@ read(10, pos=1) output(1:21) if (output(1:21).ne."ab x") call abort read(10) c - if (c.ne.achar(10)) call abort + if ((c.ne.achar(10)) .and. (c.ne.achar(13))) call abort close (10, status="delete") 10 format (a2,t1,a1,t2,a1,t20,' x') end -- 2.30.2