diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2008-05-10 20:32:40 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2008-05-10 20:32:40 +0000 |
| commit | 7b27fa7650d5e3b6789ce343e417d18ea9f8640e (patch) | |
| tree | 31328c972c66d93422a3445a76156dfa562663ae /gcc | |
| parent | 4e00d96036348f05c40cad08f7baf2fcfb1cf33c (diff) | |
| download | gcc-7b27fa7650d5e3b6789ce343e417d18ea9f8640e.zip gcc-7b27fa7650d5e3b6789ce343e417d18ea9f8640e.tar.gz gcc-7b27fa7650d5e3b6789ce343e417d18ea9f8640e.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 06bfdf4..8b29d7c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,17 +1,19 @@ -<<<<<<< .mine +2008-05-10 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + * gfortran.dg/fmt_t_5.f90: Take care of Windows CRLF line + terminator. + 2008-05-10 Kenneth Zadeck <zadeck@naturalbridge.com> PR rtl-optimization/36185 * g++.dg/opt/pr36185.C -======= 2008-05-10 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> * 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 <rdsandiford@googlemail.com> 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 c472e89..0c27b6a 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 |