From e9309517962f0412c59ece07397055327d9c1c90 Mon Sep 17 00:00:00 2001
From: Lemmih <lemmih@gmail.com>
Date: Mon, 29 Jan 2007 03:18:27 +0000
Subject: [PATCH] Fix the testsuite.

---
 testsuite/build.mk                        | 6 +++---
 testsuite/eval.mk                         | 2 +-
 testsuite/eval/eval3/Main.hs              | 4 ++--
 testsuite/foreign.mk                      | 2 +-
 testsuite/iface/null/expected             | 7 +++----
 testsuite/load/io/TestIO.hs               | 4 ++++
 testsuite/makewith/io/prog/expected       | 2 +-
 testsuite/makewith/unsafeio/prog/expected | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/testsuite/build.mk b/testsuite/build.mk
index 677a02f..3b02cb3 100644
--- a/testsuite/build.mk
+++ b/testsuite/build.mk
@@ -3,12 +3,12 @@
 include $(TOP)/config.mk
 include $(TOP)/testsuite/check.mk
 
-BIN= 		prog/a.out
+BIN= 		prog/Main
 OBJ=		prog/Main.o
 SRC=		prog/Main.hs
 
 BINDIR=		prog
-REALBIN=	./a.out
+REALBIN=	./Main
 
 API_OBJ=	api/API.o
 
@@ -32,7 +32,7 @@ $(BIN) : $(PRIOR_OBJS) $(API_OBJ) $(SRC) $(EXTRA_OBJS)
 clean:
 	find . -name '*~' -exec rm {} \;
 	rm -rf *.{o,hi,dep}
-	rm -rf */*.{hi,o,old} */a.out
+	rm -rf */*.{hi,o,old} */Main
 	rm -rf */*core
 	rm -rf */*.a
 	rm -rf */package.conf
diff --git a/testsuite/eval.mk b/testsuite/eval.mk
index f12d33f..93000b4 100644
--- a/testsuite/eval.mk
+++ b/testsuite/eval.mk
@@ -1,7 +1,7 @@
 include $(TOP)/config.mk
 include $(TOP)/testsuite/check.mk
 
-BIN=a.out
+BIN=Main
 SRC=Main.hs
 
 BINDIR=		"."
diff --git a/testsuite/eval/eval3/Main.hs b/testsuite/eval/eval3/Main.hs
index 0bbf757..b97ee65 100644
--- a/testsuite/eval/eval3/Main.hs
+++ b/testsuite/eval/eval3/Main.hs
@@ -11,7 +11,7 @@
 #include "../../../config.h"
 
 import System.Eval
-import AltData.Dynamic
+import Data.Dynamic
 
 main = do
     a <- return $ toDyn (3::Integer)
@@ -19,7 +19,7 @@ main = do
     -- so, we try to compile a function that takes a dyn.
     -- looks like with GHC 6.4, we need to make sure the package.confs work:
     m_b <- unsafeEval_ "\\dyn -> fromDyn dyn (7 :: Integer)"
-                ["AltData.Dynamic"]
+                ["Data.Dynamic"]
                 [ ]
                 [ ]
                 []
diff --git a/testsuite/foreign.mk b/testsuite/foreign.mk
index 03fdebc..6a2f04e 100644
--- a/testsuite/foreign.mk
+++ b/testsuite/foreign.mk
@@ -7,7 +7,7 @@ INCLUDES=   -I$(TOP)
 # compile with GHC to save us setting all the necessary include and
 # lib flags. use ghc -v to find out what these are if you wish to go
 # via gcc.
-BIN=./a.out
+BIN=./Main
 SRC=main.c
 
 BINDIR=		"."
diff --git a/testsuite/iface/null/expected b/testsuite/iface/null/expected
index bce07ed..60e38bb 100644
--- a/testsuite/iface/null/expected
+++ b/testsuite/iface/null/expected
@@ -1,5 +1,4 @@
-interface "Main" Main
+interface "main" Main
 module dependencies: A, B
-package dependencies: base, haskell98, hi
-import A
-import B
+package dependencies: base, plugins-1.0
+
diff --git a/testsuite/load/io/TestIO.hs b/testsuite/load/io/TestIO.hs
index 58303e1..be6f9eb 100644
--- a/testsuite/load/io/TestIO.hs
+++ b/testsuite/load/io/TestIO.hs
@@ -9,6 +9,10 @@ module TestIO ( resource, resource_dyn )  where
 import API
 import Data.Dynamic
 
+import Distribution.Package
+import Language.Haskell.Parser
+import Network.HxWeb
+
 import System.IO
 import System.Posix.Types   ( ProcessID, Fd )
 import System.Posix.Process ( forkProcess, executeFile, getProcessID )
diff --git a/testsuite/makewith/io/prog/expected b/testsuite/makewith/io/prog/expected
index b7d5354..9548efe 100644
--- a/testsuite/makewith/io/prog/expected
+++ b/testsuite/makewith/io/prog/expected
@@ -3,4 +3,4 @@ merge failed:
 parse error in ../TestIO.conf
 line: 17, col: 1
 
-a.out: failed
+Main: failed
diff --git a/testsuite/makewith/unsafeio/prog/expected b/testsuite/makewith/unsafeio/prog/expected
index bcb60f4..224a866 100644
--- a/testsuite/makewith/unsafeio/prog/expected
+++ b/testsuite/makewith/unsafeio/prog/expected
@@ -3,4 +3,4 @@ merge failed:
 parse error in ../Unsafe.conf
 line: 13, col: 1
 
-a.out: failed
+Main: failed