From 259ee3584d790fc885a43971696462c3793b1636 Mon Sep 17 00:00:00 2001 From: fxcoudert Date: Sat, 10 May 2008 20:57:42 +0000 Subject: [PATCH] * gfortran.dg/streamio_15.f90: Take care of Windows CRLF line terminator. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135162 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/streamio_15.f90 | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 30e7426..79cd88a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2008-05-10 Francois-Xavier Coudert + * gfortran.dg/streamio_15.f90: Take care of Windows CRLF line + terminator. + +2008-05-10 Francois-Xavier Coudert + * gfortran.dg/fseek.f90: Take care of Windows CRLF line terminator. diff --git a/gcc/testsuite/gfortran.dg/streamio_15.f90 b/gcc/testsuite/gfortran.dg/streamio_15.f90 index 09d9a2a..bbe91f1 100644 --- a/gcc/testsuite/gfortran.dg/streamio_15.f90 +++ b/gcc/testsuite/gfortran.dg/streamio_15.f90 @@ -4,7 +4,15 @@ program main implicit none character(len=6) :: c - integer :: i + integer :: i, newline_length + + open(20,status="scratch",access="stream",form="formatted") + write(20,"()") + inquire(20,pos=newline_length) + newline_length = newline_length - 1 + if (newline_length < 1 .or. newline_length > 2) call abort + close(20) + open(20,file="foo.txt",form="formatted",access="stream") write(20,'(A)') '123456' write(20,'(A)') 'abcdef' @@ -15,7 +23,7 @@ program main if (c.ne.'123456') call abort ! Save the position inquire(20,pos=i) - if (i.ne.8) call abort + if (i.ne.7+newline_length) call abort ! Read in the complete line... read(20,'(A)') c if (c.ne.'abcdef') call abort -- 2.7.4