[project @ 2001-02-28 10:29:41 by rrt]

Add extra results for mingw, and stop printing out the time taken in io012,
(this was debugging code which was accidentally committed earlier).

diff --git a/ghc/tests/io/should_run/Makefile b/ghc/tests/io/should_run/Makefile
index 656385f..9947e99 100644 (file)
--- a/ghc/tests/io/should_run/Makefile
+++ b/ghc/tests/io/should_run/Makefile
@@ -17,6 +17,7 @@ io022_HC_OPTS += -fglasgow-exts -package lang
 io032_HC_OPTS += -fglasgow-exts -package lang
 io035_HC_OPTS += -package lang
 
+io003_RUNTEST_OPTS += -o1 io003.stdout-mingw
 io004_RUNTEST_OPTS += -x 42
 io016_RUNTEST_OPTS += io016.hs io016.out
 io017_RUNTEST_OPTS += -i io017.stdin
@@ -24,6 +25,8 @@ io018_RUNTEST_OPTS += -i io018.hs
 io021_RUNTEST_OPTS += -i io021.hs
 io022_RUNTEST_OPTS += -i io022.hs
 io028_RUNTEST_OPTS += -i io028.hs
+io034_RUNTEST_OPTS += -o1 io034.stdout-mingw
+io035_RUNTEST_OPTS += -o1 io035.stdout-mingw
 
 .PRECIOUS: %.o %.bin
 

diff --git a/ghc/tests/io/should_run/io003.stdout-mingw b/ghc/tests/io/should_run/io003.stdout-mingw
new file mode 100644 (file)
index 0000000..ef48076
--- /dev/null
+++ b/ghc/tests/io/should_run/io003.stdout-mingw
@@ -0,0 +1 @@
+C:\TEMP\fptools-head\fptools\ghc\tests\io\should_run\io003.bin

diff --git a/ghc/tests/io/should_run/io012.hs b/ghc/tests/io/should_run/io012.hs
index 8c4ddff..3ebf203 100644 (file)
--- a/ghc/tests/io/should_run/io012.hs
+++ b/ghc/tests/io/should_run/io012.hs
@@ -6,10 +6,8 @@ import CPUTime
 
 main = do
     t <- getCPUTime
-    print t
     print (nfib 30)
     t <- getCPUTime
-    print t
     print (length (show t)) -- printing the CPU time itself is un-cool if you want to diff the output..
 
 nfib :: Integer -> Integer

diff --git a/ghc/tests/io/should_run/io034.stdout-mingw b/ghc/tests/io/should_run/io034.stdout-mingw
new file mode 100644 (file)
index 0000000..b200d03
--- /dev/null
+++ b/ghc/tests/io/should_run/io034.stdout-mingw
@@ -0,0 +1,3 @@
+Permissions{readable=True,writable=True,executable=True,searchable=True}
+Permissions{readable=True,writable=True,executable=True,searchable=True}
+Permissions{readable=True,writable=True,executable=True,searchable=True}

diff --git a/ghc/tests/io/should_run/io035.stdout-mingw b/ghc/tests/io/should_run/io035.stdout-mingw
new file mode 100644 (file)
index 0000000..f906a77
--- /dev/null
+++ b/ghc/tests/io/should_run/io035.stdout-mingw
@@ -0,0 +1,10 @@
+illegal operation
+Action: hGetChar
+Handle: {loc=stdin,type=semi-closed,buffering=block (512)}
+
+Reason: handle is closed
+illegal operation
+Action: hGetChar
+Handle: {loc=stdin,type=semi-closed,buffering=block (512)}
+
+Reason: handle is closed