[project @ 1999-11-11 17:52:58 by simonpj]

Small test fixes

diff --git a/ghc/tests/deriving/should_fail/drvfail004.stderr b/ghc/tests/deriving/should_fail/drvfail004.stderr
index 3657e58..29d77fe 100644 (file)
--- a/ghc/tests/deriving/should_fail/drvfail004.stderr
+++ b/ghc/tests/deriving/should_fail/drvfail004.stderr
@@ -1,12 +1,10 @@
 
 drvfail004.hs:5:
-    Could not deduce `Eq (Foo a b)'
-       (arising from an instance declaration at drvfail004.hs:5)
-       from the context: (Ord a1, Ord b1)
+    Could not deduce `Eq (Foo a b)' from the context: (Ord a1, Ord b1)
     Probable cause: missing `Eq (Foo a b)'
                    in instance declaration context
                    or missing instance declaration for `Eq (Foo a b)'
-    When checking the superclasses of an instance declaration
+    arising from an instance declaration at drvfail004.hs:5
 
 Compilation had errors
 

diff --git a/ghc/tests/lib/should_run/addr001.stdout b/ghc/tests/lib/should_run/addr001.stdout
new file mode 100644 (file)
index 0000000..e098b1b
--- /dev/null
+++ b/ghc/tests/lib/should_run/addr001.stdout
@@ -0,0 +1,2 @@
+0x7fffffff
+0x80000000

diff --git a/ghc/tests/lib/should_run/dynamic001.stdout b/ghc/tests/lib/should_run/dynamic001.stdout
index 0ac7b99..c2d365a 100644 (file)
--- a/ghc/tests/lib/should_run/dynamic001.stdout
+++ b/ghc/tests/lib/should_run/dynamic001.stdout
@@ -11,8 +11,8 @@
 , <<Maybe Int>>
 , <<Maybe Int>>
 , <<Maybe Int>>
-, <<Maybe Int Int>>
-, <<Maybe Char Char>>
+, <<Either Int Bool>>
+, <<Either Char Int>>
 , <<()>>
 , <<Ordering>>
 , <<((),Int)>>

diff --git a/ghc/tests/lib/should_run/enum03.hs b/ghc/tests/lib/should_run/enum03.hs
index 16efa2d..5313b0c 100644 (file)
--- a/ghc/tests/lib/should_run/enum03.hs
+++ b/ghc/tests/lib/should_run/enum03.hs
@@ -3,7 +3,7 @@ module Main(main) where
 
 import Exception
 import Word
-import Int( Num(fromInt) )
+import Int( Num(fromInt), Integral(toInt) )
 
 main = do
   putStrLn "Testing Enum Word8:"