diff --git a/ghc/tests/io/should_run/Makefile b/ghc/tests/io/should_run/Makefile
index 6cc9f8c4af6bce9fa2511675dce1cf64db2b5dec..dcdd7e6c8b719632e2d719baa03f91a55e04f834 100644
--- a/ghc/tests/io/should_run/Makefile
+++ b/ghc/tests/io/should_run/Makefile
@@ -1,11 +1,19 @@
TOP = ../..
+
include $(TOP)/mk/boilerplate.mk
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OMITTED_RUNTESTS = io005.run io033.run
+endif
+
include $(TOP)/mk/should_run.mk
HC_OPTS += -dcore-lint
io022_HC_OPTS += -fglasgow-exts
io010_HC_OPTS += -fglasgow-exts
io011_HC_OPTS += -fglasgow-exts
+io018_HC_OPTS += -fglasgow-exts
+io030_HC_OPTS += -fglasgow-exts
io032_HC_OPTS += -fglasgow-exts
io004_RUNTEST_OPTS += -x 42
diff --git a/ghc/tests/io/should_run/io005.hs b/ghc/tests/io/should_run/io005.hs
index 0fd1f8624830967069190989a986a4b6d8655c2a..ac12847e52e6b3b7003326977c72ec19a979ec9b 100644
--- a/ghc/tests/io/should_run/io005.hs
+++ b/ghc/tests/io/should_run/io005.hs
@@ -1,3 +1,5 @@
+-- Not run on mingw, because of /dev/null use
+
import System (system, ExitCode(..), exitWith)
main =
diff --git a/ghc/tests/io/should_run/io006.hs b/ghc/tests/io/should_run/io006.hs
index 27fc0059811ac71c48605f957777165876c31bbe..fe237d33ef312ee614bb5a8dbe531bf7d0b98067 100644
--- a/ghc/tests/io/should_run/io006.hs
+++ b/ghc/tests/io/should_run/io006.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main = do
hClose stderr
diff --git a/ghc/tests/io/should_run/io007.hs b/ghc/tests/io/should_run/io007.hs
index 596a78191d4c4e75dba181138b6b1edf79dce375..0cd2f7e9ff87da9a7d57a797ab0c06459031deb6 100644
--- a/ghc/tests/io/should_run/io007.hs
+++ b/ghc/tests/io/should_run/io007.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
openFile "io007.hs" ReadMode >>= \ hIn ->
diff --git a/ghc/tests/io/should_run/io007.stdout b/ghc/tests/io/should_run/io007.stdout
index 596a78191d4c4e75dba181138b6b1edf79dce375..0cd2f7e9ff87da9a7d57a797ab0c06459031deb6 100644
--- a/ghc/tests/io/should_run/io007.stdout
+++ b/ghc/tests/io/should_run/io007.stdout
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
openFile "io007.hs" ReadMode >>= \ hIn ->
diff --git a/ghc/tests/io/should_run/io008.hs b/ghc/tests/io/should_run/io008.hs
index 059e889b8499851f34cc85336097858f9ca54acc..5a3e3373ede5aa728d3d891094c7523969fe5af2 100644
--- a/ghc/tests/io/should_run/io008.hs
+++ b/ghc/tests/io/should_run/io008.hs
@@ -1,15 +1,17 @@
+-- !!! Test file positioning
+
module Main(main) where
-import IO -- 1.3
---import IOBase -- tryIO 1.3
---import GHCio
+import IO
+import Monad
-import Directory (removeFile)
+import Directory (removeFile, doesFileExist)
main = do
- hIn <- openFile "io008.in" ReadMode
- hOut <- openFile "io008.out" ReadWriteMode
- removeFile "io008.out"
+ hIn <- openFile "io008.in" ReadMode
+ f <- doesFileExist "io008.out"
+ when f (removeFile "io008.out")
+ hOut <- openFile "io008.out" ReadWriteMode
bof <- hGetPosn hIn
copy hIn hOut
hSetPosn bof
@@ -23,4 +25,3 @@ copy hIn hOut =
try (hGetChar hIn) >>=
either (\ err -> if isEOFError err then return () else error "copy")
( \ x -> hPutChar hOut x >> copy hIn hOut)
-
diff --git a/ghc/tests/io/should_run/io011.hs b/ghc/tests/io/should_run/io011.hs
index 62750f71d5c72f31c4bbc6a196118c1693a9613c..0df9e00c904f55514a91aced30f2096f8613d609 100644
--- a/ghc/tests/io/should_run/io011.hs
+++ b/ghc/tests/io/should_run/io011.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
import Directory
import IOExts (trace)
diff --git a/ghc/tests/io/should_run/io012.hs b/ghc/tests/io/should_run/io012.hs
index 5b7fe9ee12a7bd6f9ad7173abf7afc4cc5f75b26..06114c633d30323ad7a254734eb21dd755ac4caf 100644
--- a/ghc/tests/io/should_run/io012.hs
+++ b/ghc/tests/io/should_run/io012.hs
@@ -1,10 +1,11 @@
-import IO -- 1.3
+-- !!! Test getCPUTime
+
+import IO
import CPUTime
main = do
- h <- openFile "/dev/null" WriteMode
- hPrint h (nfib 30)
+ print (nfib 30)
t <- getCPUTime
print (length (show t)) -- printing the CPU time itself is un-cool if you want to diff the output..
diff --git a/ghc/tests/io/should_run/io012.stdout b/ghc/tests/io/should_run/io012.stdout
index b1bd38b62a0800a4f6a80c34e21c5acffae52c7e..a72e4b091f74a058e00c552e31075811f9129ea3 100644
--- a/ghc/tests/io/should_run/io012.stdout
+++ b/ghc/tests/io/should_run/io012.stdout
@@ -1 +1,2 @@
+2692537
13
diff --git a/ghc/tests/io/should_run/io013.hs b/ghc/tests/io/should_run/io013.hs
index a59921eba121169f98df4a0770dc1b3903887044..de3714002f2945b2aa923c9dcc64971c4a97206c 100644
--- a/ghc/tests/io/should_run/io013.hs
+++ b/ghc/tests/io/should_run/io013.hs
@@ -1,8 +1,6 @@
--- If you're testing on a Win32 box, be aware that
--- line termination conventions differ (and that
--- io013 uses /dev/null, which is also unix centric.)
+-- !!! Test seeking
-import IO -- 1.3
+import IO
main = do
h <- openFile "io013.in" ReadMode
@@ -14,9 +12,6 @@ main = do
hSeek h RelativeSeek (-2)
w <- hGetChar h
putStr (w:"\n")
- ~True <- hIsSeekable h
- hClose h
- h <- openFile "/dev/null" ReadMode
- ~False <- hIsSeekable h
+ True <- hIsSeekable h
hClose h
diff --git a/ghc/tests/io/should_run/io014.hs b/ghc/tests/io/should_run/io014.hs
index 5249fbcccb63e8087a9b28ab75463b94593a77e8..9b956b00731a975012a5ed38a6f51b894fb6b447 100644
--- a/ghc/tests/io/should_run/io014.hs
+++ b/ghc/tests/io/should_run/io014.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
sequence (map hIsOpen [stdin, stdout, stderr]) >>= \ opens ->
@@ -16,7 +16,6 @@ main =
sequence (map hIsNotBuffered [stdin, stdout, stderr]) >>= \ buffereds ->
print buffereds
where
- -- these didn't make it into 1.3
hIsBlockBuffered h = hGetBuffering h >>= \ b -> return $ case b of { BlockBuffering _ -> True; _ -> False }
hIsLineBuffered h = hGetBuffering h >>= \ b -> return $ case b of { LineBuffering -> True; _ -> False }
hIsNotBuffered h = hGetBuffering h >>= \ b -> return $ case b of { NoBuffering -> True; _ -> False }
diff --git a/ghc/tests/io/should_run/io015.hs b/ghc/tests/io/should_run/io015.hs
index 37f0cc134ab0b36de3edc3017fa23e6be4142bc4..440493fce2e6192fc61b9e2d9e2f5000885942cd 100644
--- a/ghc/tests/io/should_run/io015.hs
+++ b/ghc/tests/io/should_run/io015.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
isEOF >>= \ eof ->
diff --git a/ghc/tests/io/should_run/io016.hs b/ghc/tests/io/should_run/io016.hs
index a8b6eece0859c670054e9e542fd91070e77ad63d..fc48cb5b534da190cf7e26d848317ba39a82dfb3 100644
--- a/ghc/tests/io/should_run/io016.hs
+++ b/ghc/tests/io/should_run/io016.hs
@@ -1,13 +1,14 @@
-import IO -- 1.3
+import IO
import System (getArgs)
import Char (toUpper)
-import Directory (removeFile)
+import Directory (removeFile, doesFileExist)
main = getArgs >>= \ [f1,f2] ->
openFile f1 ReadMode >>= \ h1 ->
+ doesFileExist f2 >>= \ f ->
+ if f then removeFile f2 else return () >>
openFile f2 WriteMode >>= \ h2 ->
- removeFile f2 >>
copyFile h1 h2 >>
hClose h1 >>
hClose h2
diff --git a/ghc/tests/io/should_run/io017.hs b/ghc/tests/io/should_run/io017.hs
index 2be725480b62fc079850c0e19aa6d46aeed8a979..cba9fbd4cc713999b7de115cde5ecebabf9137ca 100644
--- a/ghc/tests/io/should_run/io017.hs
+++ b/ghc/tests/io/should_run/io017.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
hSetBuffering stdout NoBuffering >>
diff --git a/ghc/tests/io/should_run/io018.hs b/ghc/tests/io/should_run/io018.hs
index 02b24bbee018001dfa2d21f8a37417638de14750..e465b5b90a941e91f0f2f5c8fab6c92f4f32d3ac 100644
--- a/ghc/tests/io/should_run/io018.hs
+++ b/ghc/tests/io/should_run/io018.hs
@@ -1,17 +1,20 @@
-- !!! Testing RW handles
module Main(main) where
-
import IO
-import Directory (removeFile)
+import IOExts
+import Directory (removeFile, doesFileExist)
+import Monad
-- This test is weird, full marks to whoever dreamt it up!
main :: IO ()
main = do
let username = "io018.inout"
+ f <- doesFileExist username
+ when f (removeFile username)
cd <- openFile username ReadWriteMode
- removeFile username
+ hSetBinaryMode cd True
hSetBuffering stdin NoBuffering
hSetBuffering stdout NoBuffering
hSetBuffering cd NoBuffering
@@ -28,14 +31,9 @@ main = do
speakString = "Someone wants to speak with you\n"
speak cd = do
- (do
- ready <- hReady cd
- if ready then
- hGetChar cd >>= putChar
- else
- return ()
- ready <- hReady stdin
- if ready then (do { ch <- getChar; hPutChar cd ch})
- else return ())
+ ready <- hReady cd
+ if ready then hGetChar cd >>= putChar else return ()
+ ready <- hReady stdin
+ if ready then (do { ch <- getChar; hPutChar cd ch}) else return ()
speak cd
diff --git a/ghc/tests/io/should_run/io021.hs b/ghc/tests/io/should_run/io021.hs
index c45a40b9b1e4c707174f02fc5a2d619b7ec3e3ce..396d4353c974bc810cb21e5a1c17ff0d95eb730d 100644
--- a/ghc/tests/io/should_run/io021.hs
+++ b/ghc/tests/io/should_run/io021.hs
@@ -1,4 +1,4 @@
-import IO -- 1.3
+import IO
main =
hSetBuffering stdin NoBuffering >>
diff --git a/ghc/tests/io/should_run/io024.hs b/ghc/tests/io/should_run/io024.hs
index d0c698b35bb98196a020465cbdbeee0269614301..ade7de7de7eee4c88f571d0f00b234bee92db9e8 100644
--- a/ghc/tests/io/should_run/io024.hs
+++ b/ghc/tests/io/should_run/io024.hs
@@ -2,32 +2,34 @@
module Main(main) where
import IO
-import Directory ( removeFile )
+import Directory ( removeFile, doesFileExist )
+import Monad
main = do
sz <- hFileSize stdin `catch` (\ _ -> return (-1))
print sz
- let fn = "io025.out"
+ let fn = "io025.out"
+ f <- doesFileExist fn
+ when f (removeFile fn)
hdl <- openFile fn WriteMode
- removeFile fn
- hPutStrLn hdl "file_size"
+ hPutStr hdl "file_size"
-- with default buffering
sz <- hFileSize hdl
print sz
hSetBuffering hdl NoBuffering
- hPutStrLn hdl "file_size"
+ hPutStr hdl "file_size"
-- with no buffering
sz <- hFileSize hdl
print sz
hSetBuffering hdl LineBuffering
- hPutStrLn hdl "file_size"
+ hPutStr hdl "file_size"
-- with line buffering
sz <- hFileSize hdl
print sz
hSetBuffering hdl (BlockBuffering (Just 4))
-- with block buffering
- hPutStrLn hdl "file_size"
+ hPutStr hdl "file_size"
sz <- hFileSize hdl
print sz
hClose hdl
diff --git a/ghc/tests/io/should_run/io024.stdout b/ghc/tests/io/should_run/io024.stdout
index 2f3d38d47aee4c017b5c13590be8c3b7ab9f2578..23dd73404861b3e3ab4b54b4659a8beae7956357 100644
--- a/ghc/tests/io/should_run/io024.stdout
+++ b/ghc/tests/io/should_run/io024.stdout
@@ -1,5 +1,5 @@
-1
-10
-20
-30
-40
+9
+18
+27
+36
diff --git a/ghc/tests/io/should_run/io029.hs b/ghc/tests/io/should_run/io029.hs
index 8af28463fcb3574ffa4e0d34654c9369c970028b..4eb722d507cb7526e0dfdd50e9a1c33fdad99c31 100644
--- a/ghc/tests/io/should_run/io029.hs
+++ b/ghc/tests/io/should_run/io029.hs
@@ -2,7 +2,8 @@
module Main(main) where
import IO
-import Directory ( removeFile )
+import Directory ( removeFile, doesFileExist )
+import Monad
main = do
hFlush stdin `catch` \ _ -> putStrLn "No can do - flushing read-only handles isn't legal"
@@ -13,15 +14,18 @@ main = do
hdl <- openFile "io029.hs" ReadMode
hFlush hdl `catch` \ _ -> putStrLn "No can do - flushing read-only handles isn't legal"
hClose hdl
+ remove
hdl <- openFile "io029.out" WriteMode
- removeFile "io029.out"
hFlush hdl
hClose hdl
+ remove
hdl <- openFile "io029.out" AppendMode
- removeFile "io029.out"
hFlush hdl
hClose hdl
+ remove
hdl <- openFile "io029.out" ReadWriteMode
- removeFile "io029.out"
hFlush hdl
hClose hdl
+ where remove = do
+ f <- doesFileExist "io029.out"
+ when f (removeFile "io029.out")
diff --git a/ghc/tests/io/should_run/io031.hs b/ghc/tests/io/should_run/io031.hs
index 798c154a668dc575f43164d6a025cf77cdf65d4f..7cae45162f96957862312fbfe5737f52fda7e920 100644
--- a/ghc/tests/io/should_run/io031.hs
+++ b/ghc/tests/io/should_run/io031.hs
@@ -2,11 +2,13 @@
module Main(main) where
import IO
-import Directory ( removeFile )
+import Directory ( removeFile, doesFileExist )
+import Monad
-main = do
+main = do
+ f <- doesFileExist "io031.inout"
+ when f (removeFile "io031.inout")
hdl <- openFile "io031.inout" ReadWriteMode
- removeFile "io031.inout"
hSetBuffering hdl LineBuffering
hPutStr hdl "as"
hSeek hdl AbsoluteSeek 0