[project @ 2003-07-21 16:58:14 by simonmar]

update expected output after changes to Handle and IOError Show instances

9 files changed, 18 insertions, 69 deletions

diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout b/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout
index be4d8b8136..1e689bb0f9 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout
@@ -1,10 +1,2 @@
-illegal operation
-Action: hGetChar
-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,binary=False,buffering=block (8192)}
-Reason: handle is closed
-File: <stdin>
+<stdin>: hGetChar: illegal operation (handle is closed)
+<stdin>: hGetChar: illegal operation (handle is closed)
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout b/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout
index 1fa5cb8c14..0ec29ade8f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout
@@ -1,5 +1,2 @@
 this line doesn't end with a newline
-end of file
-Action: hGetLine
-Handle: {loc=<stdin>,type=readable,binary=False,buffering=line}
-File: <stdin>
+<stdin>: hGetLine: end of file
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout b/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout
index 8ca5225253..10adafd933 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout
@@ -1,4 +1,4 @@
-{loc=hGetPosn001.in,type=readable,binary=False,buffering=block (8192)} at position 0
+{handle: hGetPosn001.in} at position 0
 123456789*123456789*123456789*123456789*123456789*123456789*123456789*12
          1         2         3         4         5         6         7  
 123456789*123456789*123456789*123456789*123456789*123456789*123456789*12
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout b/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout
index a133631a01..d2671a6361 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout
@@ -1,5 +1 @@
-Left illegal operation
-Action: hSeek
-Handle: {loc=hSeek004.out,type=writable (append),binary=False,buffering=block (8192)}
-Reason: handle is not seekable
-File: hSeek004.out
+Left hSeek004.out: hSeek: illegal operation (handle is not seekable)
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr b/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr
index f023a73c52..34d1e6bdfa 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr
+++ b/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr
@@ -1,6 +1,3 @@
 
-Fail: does not exist
-Action: openFile
-Reason: No such file or directory
-File: nonexistent
+Fail: nonexistent: openFile: does not exist (No such file or directory)
 
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout b/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout
index eb69ce3f0a..57288459bd 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout
@@ -1,16 +1,4 @@
-Left inappropriate type
-Action: openFile
-Reason: is a directory
-File: .
-Left inappropriate type
-Action: openFile
-Reason: Is a directory
-File: .
-Left inappropriate type
-Action: openFile
-Reason: Is a directory
-File: .
-Left inappropriate type
-Action: openFile
-Reason: Is a directory
-File: .
+Left .: openFile: inappropriate type (is a directory)
+Left .: openFile: inappropriate type (Is a directory)
+Left .: openFile: inappropriate type (Is a directory)
+Left .: openFile: inappropriate type (Is a directory)
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout b/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout
index f32fff4330..1a4b843be0 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout
@@ -1,27 +1,12 @@
 two writes (should fail)
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile005.out1
+Left openFile005.out1: openFile: resource busy (file is locked)
 write and an append (should fail)
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile005.out1
+Left openFile005.out1: openFile: resource busy (file is locked)
 read/write and a write (should fail)
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile005.out1
+Left openFile005.out1: openFile: resource busy (file is locked)
 read and a read/write (should fail)
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile005.out1
+Left openFile005.out1: openFile: resource busy (file is locked)
 write and a read (should fail)
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile005.out1
+Left openFile005.out1: openFile: resource busy (file is locked)
 two writes, different files (silly, but should succeed)
 two reads, should succeed
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout b/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout
index a19d317eff..49669047ff 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout
@@ -1,5 +1,2 @@
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: openFile007.out
+Left openFile007.out: openFile: resource busy (file is locked)
 hello, world
diff --git a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout b/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout
index 9bb4f56e08..17e16ec0b3 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout
+++ b/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout
@@ -1,7 +1,4 @@
-Left resource busy
-Action: openFile
-Reason: file is locked
-File: readFile001.out
+Left readFile001.out: openFile: resource busy (file is locked)
 -- !!! readFile test
 
 import IO
@@ -29,4 +26,4 @@ main = do
   print h
 
 
-{loc=readFile001.out,type=writable,binary=False,buffering=block (8192)}
+{handle: readFile001.out}