aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <fxcoudert@gcc.gnu.org>2008-05-10 20:47:41 +0000
committerFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2008-05-10 20:47:41 +0000
commitd97a4451be8c81c8984b71403106b70bbf69299d (patch)
tree5d8efa26e6160b4d1dd80fd3e704375224b9cf95
parent7b27fa7650d5e3b6789ce343e417d18ea9f8640e (diff)
downloadgcc-d97a4451be8c81c8984b71403106b70bbf69299d.zip
gcc-d97a4451be8c81c8984b71403106b70bbf69299d.tar.gz
gcc-d97a4451be8c81c8984b71403106b70bbf69299d.tar.bz2
fseek.f90: Take care of Windows CRLF line terminator.
* gfortran.dg/fseek.f90: Take care of Windows CRLF line terminator. From-SVN: r135161
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/fseek.f9012
2 files changed, 15 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8b29d7c..30e7426 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2008-05-10 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+ * gfortran.dg/fseek.f90: Take care of Windows CRLF line
+ terminator.
+
+2008-05-10 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
* gfortran.dg/fmt_t_5.f90: Take care of Windows CRLF line
terminator.
diff --git a/gcc/testsuite/gfortran.dg/fseek.f90 b/gcc/testsuite/gfortran.dg/fseek.f90
index acc8211..2bf2e0d 100644
--- a/gcc/testsuite/gfortran.dg/fseek.f90
+++ b/gcc/testsuite/gfortran.dg/fseek.f90
@@ -3,10 +3,18 @@
PROGRAM test_fseek
INTEGER, PARAMETER :: SEEK_SET = 0, SEEK_CUR = 1, SEEK_END = 2, fd=10
INTEGER :: ierr = 0
+ INTEGER :: newline_length
- ! expected position: 12, one leading blank + 10 + newline
+ ! We first need to determine if a newline is one or two characters
+ open (911,status="scratch")
+ write(911,"()")
+ newline_length = ftell(911)
+ close (911)
+ if (newline_length < 1 .or. newline_length > 2) call abort()
+
+ ! expected position: one leading blank + 10 + newline
WRITE(fd, *) "1234567890"
- IF (FTELL(fd) /= 12) CALL abort()
+ IF (FTELL(fd) /= 11 + newline_length) CALL abort()
! move backward from current position
CALL FSEEK(fd, -12, SEEK_CUR, ierr)