[project @ 2001-06-01 13:07:35 by sewardj]

Track recent changes to lib/std for mingw.  Mostly, make all seeked-on
file handles be in binary mode.

diff --git a/ghc/tests/lib/IO/IOError001.stdout b/ghc/tests/lib/IO/IOError001.stdout
index cc97f11..be4d8b8 100644 (file)
--- a/ghc/tests/lib/IO/IOError001.stdout
+++ b/ghc/tests/lib/IO/IOError001.stdout
@@ -1,10 +1,10 @@
 illegal operation
 Action: hGetChar
-Handle: {loc=<stdin>,type=semi-closed,buffering=block (8192)}
+Handle: {loc=<stdin>,type=semi-closed,binary=False,buffering=block (8192)}
 Reason: handle is closed
 File: <stdin>
 illegal operation
 Action: hGetChar
-Handle: {loc=<stdin>,type=semi-closed,buffering=block (8192)}
+Handle: {loc=<stdin>,type=semi-closed,binary=False,buffering=block (8192)}
 Reason: handle is closed
 File: <stdin>

diff --git a/ghc/tests/lib/IO/IOError001.stdout-mingw b/ghc/tests/lib/IO/IOError001.stdout-mingw
index a4a8e55..2a13bc1 100644 (file)
--- a/ghc/tests/lib/IO/IOError001.stdout-mingw
+++ b/ghc/tests/lib/IO/IOError001.stdout-mingw
@@ -1,10 +1,10 @@
 illegal operation
 Action: hGetChar
-Handle: {loc=<stdin>,type=semi-closed,buffering=block (512)}
+Handle: {loc=<stdin>,type=semi-closed,binary=False,buffering=block (512)}
 Reason: handle is closed
 File: <stdin>
 illegal operation
 Action: hGetChar
-Handle: {loc=<stdin>,type=semi-closed,buffering=block (512)}
+Handle: {loc=<stdin>,type=semi-closed,binary=False,buffering=block (512)}
 Reason: handle is closed
 File: <stdin>

diff --git a/ghc/tests/lib/IO/Makefile b/ghc/tests/lib/IO/Makefile
index a828aa4..aea69fd 100644 (file)
--- a/ghc/tests/lib/IO/Makefile
+++ b/ghc/tests/lib/IO/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.5 2001/05/31 10:32:28 sewardj Exp $
+# $Id: Makefile,v 1.6 2001/06/01 13:07:36 sewardj Exp $
 
 TOP = ../..
 
@@ -17,7 +17,7 @@ hGetChar001_RUNTEST_OPTS      += -i hGetChar001.stdin
 openFile002_RUNTEST_OPTS      += -x 1
 IOError001_RUNTEST_OPTS       += -i IOError001.hs -o1 IOError001.stdout-mingw
 readwrite002_RUNTEST_OPTS     += -i readwrite002.hs
-hGetLine001_RUNTEST_OPTS      += -i hGetLine001.hs
+hGetLine001_RUNTEST_OPTS      += -i hGetLine001.hs -o1 hGetLine001.stdout-mingw
 hFileSize001_RUNTEST_OPTS     += -o1 hFileSize001.stdout-mingw
 hSeek004_RUNTEST_OPTS         += -o1 hSeek004.stdout-mingw
 

diff --git a/ghc/tests/lib/IO/hGetLine001.hs b/ghc/tests/lib/IO/hGetLine001.hs
index cb60e06..a950ab8 100644 (file)
--- a/ghc/tests/lib/IO/hGetLine001.hs
+++ b/ghc/tests/lib/IO/hGetLine001.hs
@@ -10,6 +10,8 @@ main = do
   loop stdin 
 
   h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
   hSetBuffering h NoBuffering
   loop h
 

diff --git a/ghc/tests/lib/IO/hGetLine001.stdout b/ghc/tests/lib/IO/hGetLine001.stdout
index 3ace789..54b4bfc 100644 (file)
--- a/ghc/tests/lib/IO/hGetLine001.stdout
+++ b/ghc/tests/lib/IO/hGetLine001.stdout
@@ -10,6 +10,8 @@ main = do
   loop stdin 
 
   h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
   hSetBuffering h NoBuffering
   loop h
 
@@ -32,6 +34,8 @@ main = do
   loop stdin 
 
   h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
   hSetBuffering h NoBuffering
   loop h
 
@@ -54,6 +58,8 @@ main = do
   loop stdin 
 
   h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
   hSetBuffering h NoBuffering
   loop h
 
@@ -76,6 +82,8 @@ main = do
   loop stdin 
 
   h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
   hSetBuffering h NoBuffering
   loop h
 

diff --git a/ghc/tests/lib/IO/hGetLine001.stdout-mingw b/ghc/tests/lib/IO/hGetLine001.stdout-mingw
new file mode 100644 (file)
index 0000000..a70b13d
--- /dev/null
+++ b/ghc/tests/lib/IO/hGetLine001.stdout-mingw
@@ -0,0 +1,96 @@
+-- !!! testing hGetLine
+
+import IO
+
+-- one version of 'cat'
+main = do
+  let loop h = do b <- hIsEOF h
+                 if b then return ()
+                      else do l <- hGetLine h; putStrLn l; loop h
+  loop stdin 
+
+  h <- openFile "hGetLine001.hs" ReadMode
+  hSetBinaryMode h True
+
+  hSetBuffering h NoBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h LineBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h (BlockBuffering (Just 83))
+  loop h
+-- !!! testing hGetLine\r
+\r
+import IO\r
+\r
+-- one version of 'cat'\r
+main = do\r
+  let loop h = do b <- hIsEOF h\r
+                 if b then return ()\r
+                      else do l <- hGetLine h; putStrLn l; loop h\r
+  loop stdin \r
+\r
+  h <- openFile "hGetLine001.hs" ReadMode\r
+  hSetBinaryMode h True\r
+\r
+  hSetBuffering h NoBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h LineBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h (BlockBuffering (Just 83))\r
+  loop h\r
+-- !!! testing hGetLine\r
+\r
+import IO\r
+\r
+-- one version of 'cat'\r
+main = do\r
+  let loop h = do b <- hIsEOF h\r
+                 if b then return ()\r
+                      else do l <- hGetLine h; putStrLn l; loop h\r
+  loop stdin \r
+\r
+  h <- openFile "hGetLine001.hs" ReadMode\r
+  hSetBinaryMode h True\r
+\r
+  hSetBuffering h NoBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h LineBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h (BlockBuffering (Just 83))\r
+  loop h\r
+-- !!! testing hGetLine\r
+\r
+import IO\r
+\r
+-- one version of 'cat'\r
+main = do\r
+  let loop h = do b <- hIsEOF h\r
+                 if b then return ()\r
+                      else do l <- hGetLine h; putStrLn l; loop h\r
+  loop stdin \r
+\r
+  h <- openFile "hGetLine001.hs" ReadMode\r
+  hSetBinaryMode h True\r
+\r
+  hSetBuffering h NoBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h LineBuffering\r
+  loop h\r
+\r
+  hSeek h AbsoluteSeek 0\r
+  hSetBuffering h (BlockBuffering (Just 83))\r
+  loop h\r

diff --git a/ghc/tests/lib/IO/hGetPosn001.hs b/ghc/tests/lib/IO/hGetPosn001.hs
index b952ab8..f8726b5 100644 (file)
--- a/ghc/tests/lib/IO/hGetPosn001.hs
+++ b/ghc/tests/lib/IO/hGetPosn001.hs
@@ -9,9 +9,11 @@ import Directory (removeFile, doesFileExist)
 
 main = do
   hIn <- openFile "hGetPosn001.in" ReadMode
+  hSetBinaryMode hIn True
   f <- doesFileExist "hGetPosn001.out"
   when f (removeFile "hGetPosn001.out")
   hOut <- openFile "hGetPosn001.out" ReadWriteMode
+  hSetBinaryMode hOut True
   bof <- hGetPosn hIn
   copy hIn hOut
   hSetPosn bof

diff --git a/ghc/tests/lib/IO/hIsEOF002.hs b/ghc/tests/lib/IO/hIsEOF002.hs
index a12f9b9..78a654a 100644 (file)
--- a/ghc/tests/lib/IO/hIsEOF002.hs
+++ b/ghc/tests/lib/IO/hIsEOF002.hs
@@ -4,6 +4,7 @@ import IO
 
 main = do
   h <- openFile "hIsEOF002.hs" ReadMode
+  hSetBinaryMode h True
   hSetBuffering h NoBuffering
   hSeek h SeekFromEnd 0
   hIsEOF h >>= print
@@ -38,6 +39,7 @@ main = do
   hClose h
 
   h <- openFile "hIsEOF002.out" ReadWriteMode
+  hSetBinaryMode h True
   hSetBuffering h NoBuffering
   hSeek h SeekFromEnd 0
   hIsEOF h >>= print

diff --git a/ghc/tests/lib/IO/hReady001.hs b/ghc/tests/lib/IO/hReady001.hs
index f31f69d..daae59b 100644 (file)
--- a/ghc/tests/lib/IO/hReady001.hs
+++ b/ghc/tests/lib/IO/hReady001.hs
@@ -7,5 +7,6 @@ import IO
 
 main = do
  h <- openFile "hReady001.hs" ReadMode
+ hSetBinaryMode h True
  hSeek h SeekFromEnd 0
  hReady h >>= print

diff --git a/ghc/tests/lib/IO/hSeek001.hs b/ghc/tests/lib/IO/hSeek001.hs
index a2053a1..98b75f5 100644 (file)
--- a/ghc/tests/lib/IO/hSeek001.hs
+++ b/ghc/tests/lib/IO/hSeek001.hs
@@ -4,6 +4,7 @@ import IO
 
 main = do
     h  <- openFile "hSeek001.in" ReadMode
+    hSetBinaryMode h True
     True <- hIsSeekable h
     hSeek h SeekFromEnd (-1)
     z <- hGetChar h

diff --git a/ghc/tests/lib/IO/hSeek002.hs b/ghc/tests/lib/IO/hSeek002.hs
index a23481f..d11a3df 100644 (file)
--- a/ghc/tests/lib/IO/hSeek002.hs
+++ b/ghc/tests/lib/IO/hSeek002.hs
@@ -7,6 +7,7 @@ import Directory ( removeFile )
 main :: IO ()
 main = do
    hdl <- openFile "hSeek002.hs" ReadMode
+   hSetBinaryMode hdl True
    flg <- hIsEOF hdl
    print flg
    hSeek hdl SeekFromEnd 0

diff --git a/ghc/tests/lib/IO/hSeek003.hs b/ghc/tests/lib/IO/hSeek003.hs
index d0ecf92..d6fa8e1 100644 (file)
--- a/ghc/tests/lib/IO/hSeek003.hs
+++ b/ghc/tests/lib/IO/hSeek003.hs
@@ -15,6 +15,7 @@ bmo_ls = [NoBuffering, LineBuffering, BlockBuffering Nothing,
 
 main = do
   hdl  <- openFile "hSeek003.hs" ReadMode
+  hSetBinaryMode hdl True
   sequence (zipWith testPosns (repeat hdl) bmo_ls)
   hClose hdl
 

diff --git a/ghc/tests/lib/IO/hSeek004.hs b/ghc/tests/lib/IO/hSeek004.hs
index 464fa05..5078388 100644 (file)
--- a/ghc/tests/lib/IO/hSeek004.hs
+++ b/ghc/tests/lib/IO/hSeek004.hs
@@ -4,4 +4,5 @@ import IO
 
 main = do
   h <- openFile "hSeek004.out" AppendMode
+  hSetBinaryMode h True
   try (hSeek h AbsoluteSeek 0) >>= print

diff --git a/ghc/tests/lib/IO/hSeek004.stdout b/ghc/tests/lib/IO/hSeek004.stdout
index 3083992..4826d5d 100644 (file)
--- a/ghc/tests/lib/IO/hSeek004.stdout
+++ b/ghc/tests/lib/IO/hSeek004.stdout
@@ -1,5 +1,5 @@
 Left illegal operation
 Action: hSeek
-Handle: {loc=hSeek004.out,type=writable (append),buffering=block (8192)}
+Handle: {loc=hSeek004.out,type=writable (append),binary=True,buffering=block (8192)}
 Reason: handle is not seekable
 File: hSeek004.out

diff --git a/ghc/tests/lib/IO/hSeek004.stdout-mingw b/ghc/tests/lib/IO/hSeek004.stdout-mingw
index 87d100b..7d8e707 100644 (file)
--- a/ghc/tests/lib/IO/hSeek004.stdout-mingw
+++ b/ghc/tests/lib/IO/hSeek004.stdout-mingw
@@ -1,5 +1,5 @@
 Left illegal operation
 Action: hSeek
-Handle: {loc=hSeek004.out,type=writable (append),buffering=block (512)}
+Handle: {loc=hSeek004.out,type=writable (append),binary=True,buffering=block (512)}
 Reason: handle is not seekable
 File: hSeek004.out

diff --git a/ghc/tests/lib/IO/ioeGetErrorString001.hs b/ghc/tests/lib/IO/ioeGetErrorString001.hs
index b2f84f6..dc47f91 100644 (file)
--- a/ghc/tests/lib/IO/ioeGetErrorString001.hs
+++ b/ghc/tests/lib/IO/ioeGetErrorString001.hs
@@ -5,6 +5,7 @@ import Maybe
 
 main = do
   h <- openFile "ioeGetErrorString001.hs" ReadMode
+  hSetBinaryMode h True
   hSeek h SeekFromEnd 0
   (hGetChar h >> return ()) `catch`
        \e -> if isEOFError e

diff --git a/ghc/tests/lib/IO/ioeGetFileName001.hs b/ghc/tests/lib/IO/ioeGetFileName001.hs
index 73434bb..ee7ec29 100644 (file)
--- a/ghc/tests/lib/IO/ioeGetFileName001.hs
+++ b/ghc/tests/lib/IO/ioeGetFileName001.hs
@@ -4,6 +4,7 @@ import IO
 
 main = do
   h <- openFile "ioeGetFileName001.hs" ReadMode
+  hSetBinaryMode h True
   hSeek h SeekFromEnd 0
   (hGetChar h >> return ()) `catch`
        \e -> if isEOFError e 

diff --git a/ghc/tests/lib/IO/ioeGetHandle001.hs b/ghc/tests/lib/IO/ioeGetHandle001.hs
index 0d041e0..e7e8f71 100644 (file)
--- a/ghc/tests/lib/IO/ioeGetHandle001.hs
+++ b/ghc/tests/lib/IO/ioeGetHandle001.hs
@@ -5,6 +5,7 @@ import Maybe
 
 main = do
   h <- openFile "ioeGetHandle001.hs" ReadMode
+  hSetBinaryMode h True
   hSeek h SeekFromEnd 0
   (hGetChar h >> return ()) `catch`
        \e -> if isEOFError e && fromJust (ioeGetHandle e) == h

diff --git a/ghc/tests/lib/IO/readwrite001.hs b/ghc/tests/lib/IO/readwrite001.hs
index 69b41ca..c3b542d 100644 (file)
--- a/ghc/tests/lib/IO/readwrite001.hs
+++ b/ghc/tests/lib/IO/readwrite001.hs
@@ -9,6 +9,7 @@ main = do
   f <- doesFileExist "readwrite001.inout" 
   when f (removeFile "readwrite001.inout")
   hdl <- openFile "readwrite001.inout" ReadWriteMode
+  hSetBinaryMode hdl True
   hSetBuffering hdl LineBuffering
   hPutStr hdl "as"
   hSeek hdl AbsoluteSeek 0

diff --git a/ghc/tests/lib/IO/readwrite002.hs b/ghc/tests/lib/IO/readwrite002.hs
index 3257cd6..0743e19 100644 (file)
--- a/ghc/tests/lib/IO/readwrite002.hs
+++ b/ghc/tests/lib/IO/readwrite002.hs
@@ -11,7 +11,7 @@ main = do
    f <- doesFileExist username
    when f (removeFile username)
    cd <- openFile username ReadWriteMode
---   hSetBinaryMode cd True
+   hSetBinaryMode cd True
    hSetBuffering stdin NoBuffering
    hSetBuffering stdout NoBuffering
    hSetBuffering cd NoBuffering