[project @ 2001-05-31 10:32:28 by sewardj]

Various mingw fixes.

diff --git a/ghc/tests/lib/IO/Makefile b/ghc/tests/lib/IO/Makefile
index 2bdd6db..a828aa4 100644 (file)
--- a/ghc/tests/lib/IO/Makefile
+++ b/ghc/tests/lib/IO/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.4 2001/05/31 09:48:54 sewardj Exp $
+# $Id: Makefile,v 1.5 2001/05/31 10:32:28 sewardj Exp $
 
 TOP = ../..
 
@@ -9,6 +9,7 @@ include $(TOP)/mk/should_run.mk
 
 SRC_HC_OPTS += -dcore-lint
 
+hGetBuffering001_RUNTEST_OPTS += -i hGetBuffering001.hs
 hSetBuffering002_RUNTEST_OPTS += -i hSetBuffering002.hs
 hSetBuffering003_RUNTEST_OPTS += -i hSetBuffering003.hs
 misc001_RUNTEST_OPTS          += misc001.hs misc001.out
@@ -18,6 +19,7 @@ IOError001_RUNTEST_OPTS       += -i IOError001.hs -o1 IOError001.stdout-mingw
 readwrite002_RUNTEST_OPTS     += -i readwrite002.hs
 hGetLine001_RUNTEST_OPTS      += -i hGetLine001.hs
 hFileSize001_RUNTEST_OPTS     += -o1 hFileSize001.stdout-mingw
+hSeek004_RUNTEST_OPTS         += -o1 hSeek004.stdout-mingw
 
 .PRECIOUS: %.o %.bin
 

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

diff --git a/ghc/tests/lib/IO/openFile002.hs b/ghc/tests/lib/IO/openFile002.hs
index 70d2a7d..615947e 100644 (file)
--- a/ghc/tests/lib/IO/openFile002.hs
+++ b/ghc/tests/lib/IO/openFile002.hs
@@ -3,4 +3,4 @@ import IO
 
 -- !!! Open a non-existent file for reading (should fail)
 
-main = openFile "<nonexistent>" ReadMode
+main = openFile "nonexistent" ReadMode

diff --git a/ghc/tests/lib/IO/openFile002.stderr b/ghc/tests/lib/IO/openFile002.stderr
index f40db1e..f023a73 100644 (file)
--- a/ghc/tests/lib/IO/openFile002.stderr
+++ b/ghc/tests/lib/IO/openFile002.stderr
@@ -2,5 +2,5 @@
 Fail: does not exist
 Action: openFile
 Reason: No such file or directory
-File: <nonexistent>
+File: nonexistent
 

diff --git a/ghc/tests/lib/IO/openFile006.hs b/ghc/tests/lib/IO/openFile006.hs
index 9a91886..0b9eafc 100644 (file)
--- a/ghc/tests/lib/IO/openFile006.hs
+++ b/ghc/tests/lib/IO/openFile006.hs
@@ -4,7 +4,7 @@ import IO
 
 main = do
   h <- openFile "openFile006.out" AppendMode
-  hPutStrLn h "hello, world"
+  hPutStr h "hello, world"
   size <- hFileSize h
   print size
   hClose h

diff --git a/ghc/tests/lib/IO/openFile006.stdout b/ghc/tests/lib/IO/openFile006.stdout
index 33a9dba..368283e 100644 (file)
--- a/ghc/tests/lib/IO/openFile006.stdout
+++ b/ghc/tests/lib/IO/openFile006.stdout
@@ -1,2 +1,2 @@
-13
+12
 0