From 97f5fc60eae89ae61f95622e59a0f6a0a311af4f Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Fri, 3 Nov 2000 16:23:39 +0000
Subject: [PATCH] [project @ 2000-11-03 16:23:37 by simonmar] "make clean" in
 here now works as advertised.

---
 ghc/tests/ccall/should_compile/cc006.hs         |    2 +-
 ghc/tests/ccall/should_compile/cc007.hs         |    2 +-
 ghc/tests/ccall/should_compile/cc008.hs         |    2 +-
 ghc/tests/ccall/should_compile/cc009.hs         |    2 +-
 ghc/tests/codeGen/should_run/Makefile           |    5 ++---
 ghc/tests/concurrent/should_run/Makefile        |    4 +++-
 ghc/tests/deSugar/should_compile/ds-wildcard.hs |    2 +-
 ghc/tests/deSugar/should_compile/ds001.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds002.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds003.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds004.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds005.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds006.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds007.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds008.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds009.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds010.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds011.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds012.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds013.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds014.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds015.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds016.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds017.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds018.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds019.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds020.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds021.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds022.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds023.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds024.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds025.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds026.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds027.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds028.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds029.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds030.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds031.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds032.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds033.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds034.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds036.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds037.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds038.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds039.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds040.hs       |    2 ++
 ghc/tests/deSugar/should_compile/ds041.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds045.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds046.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds047.hs       |    2 +-
 ghc/tests/deSugar/should_compile/ds048.hs       |    2 +-
 ghc/tests/io/should_run/Makefile                |    2 ++
 ghc/tests/mk/should_compile.mk                  |    6 +++++-
 ghc/tests/mk/should_fail.mk                     |    4 ++++
 ghc/tests/mk/should_run.mk                      |    2 +-
 ghc/tests/programs/Makefile                     |    4 ++--
 ghc/tests/programs/callback/Makefile            |    8 +++++---
 ghc/tests/reader/should_compile/Makefile        |    2 ++
 ghc/tests/reader/should_compile/MyList.hi       |    5 -----
 ghc/tests/reader/should_compile/read002.hs      |    2 +-
 ghc/tests/reader/should_compile/read003.hs      |    2 +-
 ghc/tests/reader/should_compile/read004.hs      |    2 +-
 ghc/tests/reader/should_compile/read005.hs      |    2 ++
 ghc/tests/reader/should_compile/read005.stderr  |    1 -
 ghc/tests/reader/should_compile/read006.hs      |    1 -
 ghc/tests/reader/should_compile/read007.hs      |    2 +-
 ghc/tests/reader/should_compile/read008.hs      |    2 +-
 ghc/tests/reader/should_compile/read009.hs      |    2 +-
 ghc/tests/reader/should_compile/read010.hs      |    2 +-
 ghc/tests/reader/should_compile/read011.hs      |    2 +-
 ghc/tests/reader/should_compile/read014.hs      |    2 +-
 ghc/tests/reader/should_compile/read015.hs      |    2 +-
 ghc/tests/reader/should_compile/read016.hs      |    2 +-
 ghc/tests/reader/should_compile/read017.hs      |    2 +-
 ghc/tests/reader/should_compile/read018.hs      |    2 +-
 ghc/tests/reader/should_compile/read019.hs      |    2 +-
 ghc/tests/reader/should_compile/read020.hs      |    2 +-
 ghc/tests/reader/should_compile/read021.hs      |    2 +-
 ghc/tests/rename/should_compile/Makefile        |    3 +++
 ghc/tests/rename/should_compile/rn025.hs        |    2 +-
 ghc/tests/rename/should_compile/rn026.hs        |    2 +-
 ghc/tests/rename/should_compile/rn027.hs        |    2 +-
 ghc/tests/rename/should_compile/rn028.hs        |    4 ++--
 ghc/tests/rename/should_compile/rn029.hs        |    4 ++--
 ghc/tests/rename/should_compile/rn030.hs        |    2 +-
 ghc/tests/rename/should_compile/rn031.hs        |    2 +-
 ghc/tests/rename/should_compile/rn032.hs        |    4 ++--
 ghc/tests/rename/should_compile/rn033.hs        |    4 ++--
 ghc/tests/rename/should_compile/rn034.hs        |    2 +-
 ghc/tests/rename/should_compile/rn035.hs        |    2 +-
 ghc/tests/rename/should_compile/rn036.hs        |    2 +-
 ghc/tests/rename/should_compile/rn037.hs        |    2 +-
 ghc/tests/simplCore/should_compile/simpl001.hs  |    2 +-
 ghc/tests/simplCore/should_compile/simpl002.hs  |    2 +-
 ghc/tests/simplCore/should_compile/simpl003.hs  |    2 +-
 95 files changed, 117 insertions(+), 102 deletions(-)
 delete mode 100644 ghc/tests/reader/should_compile/MyList.hi
 delete mode 100644 ghc/tests/reader/should_compile/read005.stderr

diff --git a/ghc/tests/ccall/should_compile/cc006.hs b/ghc/tests/ccall/should_compile/cc006.hs
index 3740107..ede31d7 100644
--- a/ghc/tests/ccall/should_compile/cc006.hs
+++ b/ghc/tests/ccall/should_compile/cc006.hs
@@ -1,6 +1,6 @@
 -- !!! cc006 -- ccall with non-standard boxed arguments and results
 
-module Test where
+module ShouldCompile where
 
 import Foreign
 import CCall
diff --git a/ghc/tests/ccall/should_compile/cc007.hs b/ghc/tests/ccall/should_compile/cc007.hs
index b1528b4..70a15f2 100644
--- a/ghc/tests/ccall/should_compile/cc007.hs
+++ b/ghc/tests/ccall/should_compile/cc007.hs
@@ -1,4 +1,4 @@
 -- !!! cc007 -- foreign import with external name equal to Haskell name.
-module Test where
+module ShouldCompile where
 
 foreign import sine :: Double -> Double
diff --git a/ghc/tests/ccall/should_compile/cc008.hs b/ghc/tests/ccall/should_compile/cc008.hs
index 6e141f4..b6725e3 100644
--- a/ghc/tests/ccall/should_compile/cc008.hs
+++ b/ghc/tests/ccall/should_compile/cc008.hs
@@ -1,5 +1,5 @@
 -- !!! cc008 -- foreign export dynamic returning newtype of Addr
-module Test where
+module ShouldCompile where
 
 import Addr
 
diff --git a/ghc/tests/ccall/should_compile/cc009.hs b/ghc/tests/ccall/should_compile/cc009.hs
index 959ebea..6a6ebca 100644
--- a/ghc/tests/ccall/should_compile/cc009.hs
+++ b/ghc/tests/ccall/should_compile/cc009.hs
@@ -1,5 +1,5 @@
 -- !!! cc009 -- foreign label returning newtype of Addr
-module Test where
+module ShouldCompile where
 
 import Addr
 
diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile
index 73d44ab..d9b7a9f 100644
--- a/ghc/tests/codeGen/should_run/Makefile
+++ b/ghc/tests/codeGen/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.14 2000/08/22 14:05:05 sewardj Exp $
+# $Id: Makefile,v 1.15 2000/11/03 16:23:37 simonmar Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -39,7 +39,6 @@ SRC_MKDEPENDHS_OPTS += -fglasgow-exts
 
 .PRECIOUS: %.bin %.o
 
-clean ::
-	rm -f *.bin *.o
+CLEAN_FILES += PrelMain.hi
 
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/concurrent/should_run/Makefile b/ghc/tests/concurrent/should_run/Makefile
index b17dea1..6b0271d 100644
--- a/ghc/tests/concurrent/should_run/Makefile
+++ b/ghc/tests/concurrent/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 2000/06/12 17:01:57 panne Exp $
+# $Id: Makefile,v 1.9 2000/11/03 16:23:37 simonmar Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -16,4 +16,6 @@ conc021_RUNTEST_OPTS = -x 250
 
 SRC_HC_OPTS += -dcore-lint -package concurrent -fglasgow-exts
 
+CLEAN_FILES += PrelMain.hi
+
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/deSugar/should_compile/ds-wildcard.hs b/ghc/tests/deSugar/should_compile/ds-wildcard.hs
index 24c5b3b..dae882c 100644
--- a/ghc/tests/deSugar/should_compile/ds-wildcard.hs
+++ b/ghc/tests/deSugar/should_compile/ds-wildcard.hs
@@ -1,3 +1,3 @@
-module ShouldSucceed where
+module ShouldCompile where
 
 x@_ = x
diff --git a/ghc/tests/deSugar/should_compile/ds001.hs b/ghc/tests/deSugar/should_compile/ds001.hs
index a62c7b4..d3f0b60 100644
--- a/ghc/tests/deSugar/should_compile/ds001.hs
+++ b/ghc/tests/deSugar/should_compile/ds001.hs
@@ -2,7 +2,7 @@
 --
 -- this tests ultra-simple function and pattern bindings (no patterns)
 
-module Test where
+module ShouldCompile where
 
 -- simple function bindings
 
diff --git a/ghc/tests/deSugar/should_compile/ds002.hs b/ghc/tests/deSugar/should_compile/ds002.hs
index a63de94..280674e 100644
--- a/ghc/tests/deSugar/should_compile/ds002.hs
+++ b/ghc/tests/deSugar/should_compile/ds002.hs
@@ -2,7 +2,7 @@
 --
 -- this tests "overlapping" variables and guards
 
-module Test where
+module ShouldCompile where
 
 f x = x
 f y = y
diff --git a/ghc/tests/deSugar/should_compile/ds003.hs b/ghc/tests/deSugar/should_compile/ds003.hs
index 0faff0e..dafeac9 100644
--- a/ghc/tests/deSugar/should_compile/ds003.hs
+++ b/ghc/tests/deSugar/should_compile/ds003.hs
@@ -1,6 +1,6 @@
 -- !!! ds003 -- list, tuple, lazy, as patterns
 --
-module Test where
+module ShouldCompile where
 
 f []		y	 True  = []
 f x		a@(y,ys) ~z    = []
diff --git a/ghc/tests/deSugar/should_compile/ds004.hs b/ghc/tests/deSugar/should_compile/ds004.hs
index cd89e18..ebbe8e0 100644
--- a/ghc/tests/deSugar/should_compile/ds004.hs
+++ b/ghc/tests/deSugar/should_compile/ds004.hs
@@ -1,6 +1,6 @@
 -- !!! ds004 -- nodups from SLPJ p 79
 --
-module Test where
+module ShouldCompile where
 
 -- SLPJ, p 79
 nodups []                   = []
diff --git a/ghc/tests/deSugar/should_compile/ds005.hs b/ghc/tests/deSugar/should_compile/ds005.hs
index 6fca84b..a02e8d9 100644
--- a/ghc/tests/deSugar/should_compile/ds005.hs
+++ b/ghc/tests/deSugar/should_compile/ds005.hs
@@ -2,7 +2,7 @@
 --
 -- this simply tests a "typical" example
 
-module MapPairs where
+module ShouldCompile where
 
 -- from SLPJ, p 78
 mappairs f []     ys     = []
diff --git a/ghc/tests/deSugar/should_compile/ds006.hs b/ghc/tests/deSugar/should_compile/ds006.hs
index ba05547..d66e7c1 100644
--- a/ghc/tests/deSugar/should_compile/ds006.hs
+++ b/ghc/tests/deSugar/should_compile/ds006.hs
@@ -1,6 +1,6 @@
 -- !!! ds006 -- v | True = v+1 | False = v (dead code elim)
 --
-module Test where
+module ShouldCompile where
 
 v | True  = v + 1
   | False = v
diff --git a/ghc/tests/deSugar/should_compile/ds007.hs b/ghc/tests/deSugar/should_compile/ds007.hs
index dd0fcd5..ae12cf7 100644
--- a/ghc/tests/deSugar/should_compile/ds007.hs
+++ b/ghc/tests/deSugar/should_compile/ds007.hs
@@ -1,6 +1,6 @@
 -- !!! ds007 -- simple local bindings
 
-module ShouldSucceed where
+module ShouldCompile where
 
 w = a where a = y
             y = []
diff --git a/ghc/tests/deSugar/should_compile/ds008.hs b/ghc/tests/deSugar/should_compile/ds008.hs
index a97470d..73707ed 100644
--- a/ghc/tests/deSugar/should_compile/ds008.hs
+++ b/ghc/tests/deSugar/should_compile/ds008.hs
@@ -2,7 +2,7 @@
 --
 -- these tests involve way-cool TyApps
 
-module Test where
+module ShouldCompile where
 
 f x = []
 
diff --git a/ghc/tests/deSugar/should_compile/ds009.hs b/ghc/tests/deSugar/should_compile/ds009.hs
index ba20556..6ebcc96 100644
--- a/ghc/tests/deSugar/should_compile/ds009.hs
+++ b/ghc/tests/deSugar/should_compile/ds009.hs
@@ -1,6 +1,6 @@
 -- !!! ds009 -- simple list comprehensions
 
-module SimpleListComp where
+module ShouldCompile where
 
 f xs = [ x | x <- xs ]
 
diff --git a/ghc/tests/deSugar/should_compile/ds010.hs b/ghc/tests/deSugar/should_compile/ds010.hs
index abf6fa1..268610e 100644
--- a/ghc/tests/deSugar/should_compile/ds010.hs
+++ b/ghc/tests/deSugar/should_compile/ds010.hs
@@ -1,6 +1,6 @@
 -- !!! ds010 -- deeply-nested list comprehensions
 
-module Test where
+module ShouldCompile where
 
 z = [ (a,b,c,d,e,f,g,h,i,j) | a <- "12",
 			      b <- "12",
diff --git a/ghc/tests/deSugar/should_compile/ds011.hs b/ghc/tests/deSugar/should_compile/ds011.hs
index f9dc13d..dab482f 100644
--- a/ghc/tests/deSugar/should_compile/ds011.hs
+++ b/ghc/tests/deSugar/should_compile/ds011.hs
@@ -1,6 +1,6 @@
 -- !!! ds011 -- uses of "error"
 
-module Tests where
+module ShouldCompile where
 
 f = error []
 
diff --git a/ghc/tests/deSugar/should_compile/ds012.hs b/ghc/tests/deSugar/should_compile/ds012.hs
index 8870881..4ef9d8c 100644
--- a/ghc/tests/deSugar/should_compile/ds012.hs
+++ b/ghc/tests/deSugar/should_compile/ds012.hs
@@ -1,6 +1,6 @@
 -- !!! ds012 -- simple Integer arithmetic
 --
-module Tests where
+module ShouldCompile where
 
 f x = 1 + 2 - 3 + 4 * 5
 
diff --git a/ghc/tests/deSugar/should_compile/ds013.hs b/ghc/tests/deSugar/should_compile/ds013.hs
index da7267d..3fb55ab 100644
--- a/ghc/tests/deSugar/should_compile/ds013.hs
+++ b/ghc/tests/deSugar/should_compile/ds013.hs
@@ -1,6 +1,6 @@
 -- !!! ds013 -- simple Rational arithmetic
 
-module Tests where
+module ShouldCompile where
 
 f = 1.5 + 2.0 - 3.14159265 + 4.2 * 5.111111111111111111111111111
 
diff --git a/ghc/tests/deSugar/should_compile/ds014.hs b/ghc/tests/deSugar/should_compile/ds014.hs
index 8770cb7..23b3709 100644
--- a/ghc/tests/deSugar/should_compile/ds014.hs
+++ b/ghc/tests/deSugar/should_compile/ds014.hs
@@ -1,7 +1,7 @@
 -- !!! ds014 -- character and string literals
 -- !!!   really should add ALL weird forms...
 
-module Tests where
+module ShouldCompile where
 
 a = 'a'
 b = "b"
diff --git a/ghc/tests/deSugar/should_compile/ds015.hs b/ghc/tests/deSugar/should_compile/ds015.hs
index b14cc6e..2464577 100644
--- a/ghc/tests/deSugar/should_compile/ds015.hs
+++ b/ghc/tests/deSugar/should_compile/ds015.hs
@@ -1,6 +1,6 @@
 -- !!! ds015 -- lambdas
 --
-module Tests where
+module ShouldCompile where
 
 f x = ( \ x -> x ) x
 
diff --git a/ghc/tests/deSugar/should_compile/ds016.hs b/ghc/tests/deSugar/should_compile/ds016.hs
index 370c37e..41394e7 100644
--- a/ghc/tests/deSugar/should_compile/ds016.hs
+++ b/ghc/tests/deSugar/should_compile/ds016.hs
@@ -1,6 +1,6 @@
 -- !!! ds016 -- case expressions
 --
-module Tests where
+module ShouldCompile where
 
 f x y z =
     case ( x ++ x ++ x ++ x ++ x ) of
diff --git a/ghc/tests/deSugar/should_compile/ds017.hs b/ghc/tests/deSugar/should_compile/ds017.hs
index 2009244..e6fd6d0 100644
--- a/ghc/tests/deSugar/should_compile/ds017.hs
+++ b/ghc/tests/deSugar/should_compile/ds017.hs
@@ -1,6 +1,6 @@
 -- !!! ds017 -- let expressions
 --
-module Tests where
+module ShouldCompile where
 
 f x y z
   = let
diff --git a/ghc/tests/deSugar/should_compile/ds018.hs b/ghc/tests/deSugar/should_compile/ds018.hs
index 00098bd..b521bad 100644
--- a/ghc/tests/deSugar/should_compile/ds018.hs
+++ b/ghc/tests/deSugar/should_compile/ds018.hs
@@ -1,6 +1,6 @@
 -- !!! ds018 -- explicit lists and tuples
 --
-module Tests where
+module ShouldCompile where
 
 -- exprs
 
diff --git a/ghc/tests/deSugar/should_compile/ds019.hs b/ghc/tests/deSugar/should_compile/ds019.hs
index 8056a54..6bcf43f 100644
--- a/ghc/tests/deSugar/should_compile/ds019.hs
+++ b/ghc/tests/deSugar/should_compile/ds019.hs
@@ -1,6 +1,6 @@
 -- !!! ds019 -- mixed var and uni-constructor pats
 
-module Test where
+module ShouldCompile where
 
 f (a,b,c) i     o = []
 f d       (j,k) p = []
diff --git a/ghc/tests/deSugar/should_compile/ds020.hs b/ghc/tests/deSugar/should_compile/ds020.hs
index 86ffff1..479d57a 100644
--- a/ghc/tests/deSugar/should_compile/ds020.hs
+++ b/ghc/tests/deSugar/should_compile/ds020.hs
@@ -1,6 +1,6 @@
 -- !!! ds020 -- lazy patterns (in detail)
 --
-module Test where
+module ShouldCompile where
 
 a ~([],[],[])    = []
 a ~(~[],~[],~[]) = []
diff --git a/ghc/tests/deSugar/should_compile/ds021.hs b/ghc/tests/deSugar/should_compile/ds021.hs
index 1f33591..4faaba5 100644
--- a/ghc/tests/deSugar/should_compile/ds021.hs
+++ b/ghc/tests/deSugar/should_compile/ds021.hs
@@ -1,6 +1,6 @@
 -- !!! ds021 -- hairier uses of guards
 
-module Test where
+module ShouldCompile where
 
 f x y z | x == y     = []
 	| x /= z     = []
diff --git a/ghc/tests/deSugar/should_compile/ds022.hs b/ghc/tests/deSugar/should_compile/ds022.hs
index 6728710..2ac429f 100644
--- a/ghc/tests/deSugar/should_compile/ds022.hs
+++ b/ghc/tests/deSugar/should_compile/ds022.hs
@@ -1,6 +1,6 @@
 -- !!! ds022 -- literal patterns (wimp version)
 --
-module Tests where
+module ShouldCompile where
 
 f 1 1.1 = []
 f 2 2.2 = []
diff --git a/ghc/tests/deSugar/should_compile/ds023.hs b/ghc/tests/deSugar/should_compile/ds023.hs
index a15c464..736107d 100644
--- a/ghc/tests/deSugar/should_compile/ds023.hs
+++ b/ghc/tests/deSugar/should_compile/ds023.hs
@@ -1,6 +1,6 @@
 -- !!! ds023 -- overloading eg from section 9.2
 --
-module Tests where
+module ShouldCompile where
 
 f x	= g (x == x) x
 g b x	= abs (f x)
diff --git a/ghc/tests/deSugar/should_compile/ds024.hs b/ghc/tests/deSugar/should_compile/ds024.hs
index 9c1c9d8..76606a9 100644
--- a/ghc/tests/deSugar/should_compile/ds024.hs
+++ b/ghc/tests/deSugar/should_compile/ds024.hs
@@ -3,7 +3,7 @@
 -- do all the right types get stuck on all the
 -- Nils and Conses?
 
-module ShouldSucceed where
+module ShouldCompile where
 
 
 f x = [[], []]
diff --git a/ghc/tests/deSugar/should_compile/ds025.hs b/ghc/tests/deSugar/should_compile/ds025.hs
index 8b7651f..fdbf0ff 100644
--- a/ghc/tests/deSugar/should_compile/ds025.hs
+++ b/ghc/tests/deSugar/should_compile/ds025.hs
@@ -1,6 +1,6 @@
 -- !!! ds025 -- overloaded assoc -- AbsBinds
 
-module Util where
+module ShouldCompile where
 
 ehead xs loc | null xs = error ("4"++loc)
              | True = head xs
diff --git a/ghc/tests/deSugar/should_compile/ds026.hs b/ghc/tests/deSugar/should_compile/ds026.hs
index 969587d..f21ca0b 100644
--- a/ghc/tests/deSugar/should_compile/ds026.hs
+++ b/ghc/tests/deSugar/should_compile/ds026.hs
@@ -1,6 +1,6 @@
 -- !!! ds026 -- classes -- incl. polymorphic method
 
-module ShouldSucceed where
+module ShouldCompile where
 
 class Foo a where
   op :: a -> a
diff --git a/ghc/tests/deSugar/should_compile/ds027.hs b/ghc/tests/deSugar/should_compile/ds027.hs
index 5f7a545..436958e 100644
--- a/ghc/tests/deSugar/should_compile/ds027.hs
+++ b/ghc/tests/deSugar/should_compile/ds027.hs
@@ -1,6 +1,6 @@
 -- !!! ds027 -- simple instances
 --
-module Test where
+module ShouldCompile where
 
 data Foo = Bar | Baz
 
diff --git a/ghc/tests/deSugar/should_compile/ds028.hs b/ghc/tests/deSugar/should_compile/ds028.hs
index bec8c19..4c7944a 100644
--- a/ghc/tests/deSugar/should_compile/ds028.hs
+++ b/ghc/tests/deSugar/should_compile/ds028.hs
@@ -1,6 +1,6 @@
 -- !!! ds028: failable pats in top row
 
-module ShouldSucceed where
+module ShouldCompile where
 
 
 -- when the first row of pats doesn't have convenient
diff --git a/ghc/tests/deSugar/should_compile/ds029.hs b/ghc/tests/deSugar/should_compile/ds029.hs
index 833e19b..0000523 100644
--- a/ghc/tests/deSugar/should_compile/ds029.hs
+++ b/ghc/tests/deSugar/should_compile/ds029.hs
@@ -1,7 +1,7 @@
 -- !!! ds029: pattern binding with guards (dubious but valid)
 --
 
-module Test where
+module ShouldCompile where
 
 f x = y
     where (y,z) | y < z     = (0,1)
diff --git a/ghc/tests/deSugar/should_compile/ds030.hs b/ghc/tests/deSugar/should_compile/ds030.hs
index 6046fd9..8475b55 100644
--- a/ghc/tests/deSugar/should_compile/ds030.hs
+++ b/ghc/tests/deSugar/should_compile/ds030.hs
@@ -1,5 +1,5 @@
 -- !!! ds030: checks that types substituted into binders
 --
-module Test where
+module ShouldCompile where
 
 f x = case x of [] -> (3::Int) ; _ -> (4::Int)
diff --git a/ghc/tests/deSugar/should_compile/ds031.hs b/ghc/tests/deSugar/should_compile/ds031.hs
index 3378800..5f25c15 100644
--- a/ghc/tests/deSugar/should_compile/ds031.hs
+++ b/ghc/tests/deSugar/should_compile/ds031.hs
@@ -1,4 +1,4 @@
-module ShouldSucceed where
+module ShouldCompile where
 
 foldPair :: (a->a->a,b->b->b) -> (a,b) -> [(a,b)] -> (a,b)
 foldPair fg       ab [] = ab
diff --git a/ghc/tests/deSugar/should_compile/ds032.hs b/ghc/tests/deSugar/should_compile/ds032.hs
index 65f06c3..09e2de1 100644
--- a/ghc/tests/deSugar/should_compile/ds032.hs
+++ b/ghc/tests/deSugar/should_compile/ds032.hs
@@ -1,6 +1,6 @@
 -- !!! recursive funs tangled in an AbsBind
 
-module ShouldSucceed where
+module ShouldCompile where
 
 
 flatten :: Int		-- Indentation
diff --git a/ghc/tests/deSugar/should_compile/ds033.hs b/ghc/tests/deSugar/should_compile/ds033.hs
index 83a00ca..9d89a93 100644
--- a/ghc/tests/deSugar/should_compile/ds033.hs
+++ b/ghc/tests/deSugar/should_compile/ds033.hs
@@ -1,6 +1,6 @@
 -- !!! getting top-level dependencies right
 --
-module Test where
+module ShouldCompile where
 
 f1 x = g1 x
 g1 y = y
diff --git a/ghc/tests/deSugar/should_compile/ds034.hs b/ghc/tests/deSugar/should_compile/ds034.hs
index 47a190e..0725a7a 100644
--- a/ghc/tests/deSugar/should_compile/ds034.hs
+++ b/ghc/tests/deSugar/should_compile/ds034.hs
@@ -1,6 +1,6 @@
 -- !!! mutually-recursive methods in an instance declaration
 --
-module Test where
+module ShouldCompile where
 
 class Foo a where
     op1 :: a -> a 
diff --git a/ghc/tests/deSugar/should_compile/ds036.hs b/ghc/tests/deSugar/should_compile/ds036.hs
index fc30c07..a024402 100644
--- a/ghc/tests/deSugar/should_compile/ds036.hs
+++ b/ghc/tests/deSugar/should_compile/ds036.hs
@@ -13,7 +13,7 @@ error in the code below which disappears when the last line is
 commented out
 -}
 
-module Test2 where
+module ShouldCompile where
 
 --brack :: (Eq a) => a -> a -> [a] -> ([a],[a])
 --brack open close = brack' open close (1 :: Int)
diff --git a/ghc/tests/deSugar/should_compile/ds037.hs b/ghc/tests/deSugar/should_compile/ds037.hs
index 72eb43a..d5fc130 100644
--- a/ghc/tests/deSugar/should_compile/ds037.hs
+++ b/ghc/tests/deSugar/should_compile/ds037.hs
@@ -1,6 +1,6 @@
 -- !!! AbsBinds with tyvars, no dictvars, but some dict binds
 --
-module ShouldSucceed where
+module ShouldCompile where
 
 f x y = (fst (g y x), x+(1::Int))
 g x y = (fst (f x y), y+(1::Int))
diff --git a/ghc/tests/deSugar/should_compile/ds038.hs b/ghc/tests/deSugar/should_compile/ds038.hs
index 6436b57..04b043c 100644
--- a/ghc/tests/deSugar/should_compile/ds038.hs
+++ b/ghc/tests/deSugar/should_compile/ds038.hs
@@ -1,7 +1,7 @@
 -- !!! Jon Hill reported a bug in desugaring this in 0.09
 -- !!! (recursive with n+k patts)
 --
-module ShouldSucceed where
+module ShouldCompile where
 
 takeList :: Int -> [a] -> [a]
 takeList 0     _      = []
diff --git a/ghc/tests/deSugar/should_compile/ds039.hs b/ghc/tests/deSugar/should_compile/ds039.hs
index a6588a4..ad000a5 100644
--- a/ghc/tests/deSugar/should_compile/ds039.hs
+++ b/ghc/tests/deSugar/should_compile/ds039.hs
@@ -1,7 +1,7 @@
 -- !!! make sure correct type applications get put in
 -- !!!   when (:) is saturated.
 
-module ShouldSucceed where
+module ShouldCompile where
 
 
 f = (:)
diff --git a/ghc/tests/deSugar/should_compile/ds040.hs b/ghc/tests/deSugar/should_compile/ds040.hs
index 8be249b..c02f9f4 100644
--- a/ghc/tests/deSugar/should_compile/ds040.hs
+++ b/ghc/tests/deSugar/should_compile/ds040.hs
@@ -1,3 +1,5 @@
+module ShouldCompile where
+
 -- !!! Another bug in overloaded n+k patts
 --
 
diff --git a/ghc/tests/deSugar/should_compile/ds041.hs b/ghc/tests/deSugar/should_compile/ds041.hs
index 072ed89..9fafd58 100644
--- a/ghc/tests/deSugar/should_compile/ds041.hs
+++ b/ghc/tests/deSugar/should_compile/ds041.hs
@@ -7,7 +7,7 @@
 	   the constructor properly.
 -}
 
-module Bug where
+module ShouldCompile where
 
 data Eq a => Foo a = Foo { x :: a }
 
diff --git a/ghc/tests/deSugar/should_compile/ds045.hs b/ghc/tests/deSugar/should_compile/ds045.hs
index 207132e..0bbc767 100644
--- a/ghc/tests/deSugar/should_compile/ds045.hs
+++ b/ghc/tests/deSugar/should_compile/ds045.hs
@@ -5,7 +5,7 @@
 -- To: glasgow-haskell-bugs@majordomo.haskell.org
 -- Subject: compiler-bug
 
-module Test where
+module ShouldCompile where
 
 erroR :: Int
 erroR = n where
diff --git a/ghc/tests/deSugar/should_compile/ds046.hs b/ghc/tests/deSugar/should_compile/ds046.hs
index 191e943..5126ff3 100644
--- a/ghc/tests/deSugar/should_compile/ds046.hs
+++ b/ghc/tests/deSugar/should_compile/ds046.hs
@@ -1,4 +1,4 @@
-module Test where
+module ShouldCompile where
 
 -- Strict field unpacking tests: compile with -O -funbox-strict-fields.
 
diff --git a/ghc/tests/deSugar/should_compile/ds047.hs b/ghc/tests/deSugar/should_compile/ds047.hs
index 90078e0..f6ee2b5 100644
--- a/ghc/tests/deSugar/should_compile/ds047.hs
+++ b/ghc/tests/deSugar/should_compile/ds047.hs
@@ -1,6 +1,6 @@
 -- !!! Nullary rec-pats for constructors that hasn't got any labelled
 -- !!! fields is legal Haskell, and requires extra care in the desugarer.
-module Test where
+module ShouldCompile where
 
 data X = X Int [Int]
 
diff --git a/ghc/tests/deSugar/should_compile/ds048.hs b/ghc/tests/deSugar/should_compile/ds048.hs
index 2003430..9274aac 100644
--- a/ghc/tests/deSugar/should_compile/ds048.hs
+++ b/ghc/tests/deSugar/should_compile/ds048.hs
@@ -1,5 +1,5 @@
 -- !!! newtypes with a labelled field.
-module ShouldSucceed where
+module ShouldCompile where
 
 newtype Foo = Foo { x :: Int } deriving (Eq)
 
diff --git a/ghc/tests/io/should_run/Makefile b/ghc/tests/io/should_run/Makefile
index 86ffcf7..4e19bcf 100644
--- a/ghc/tests/io/should_run/Makefile
+++ b/ghc/tests/io/should_run/Makefile
@@ -27,4 +27,6 @@ io028_RUNTEST_OPTS += -i io028.hs
 
 .PRECIOUS: %.o %.bin
 
+CLEAN_FILES += *.out *.inout
+
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/mk/should_compile.mk b/ghc/tests/mk/should_compile.mk
index 929ced2..3fdcc62 100644
--- a/ghc/tests/mk/should_compile.mk
+++ b/ghc/tests/mk/should_compile.mk
@@ -1,4 +1,5 @@
 #-----------------------------------------------------------------------------
+# $Id: should_compile.mk,v 1.4 2000/11/03 16:23:38 simonmar Exp $
 # template for should_compile tests.
 
 HS_SRCS = $(wildcard *.hs)
@@ -9,7 +10,10 @@ SRC_RUNTEST_OPTS += -x 0 \
 
 %.o : %.hs
 	@echo ---- Testing for successful compilation of $<
-	@$(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -c $< -o $@
+	$(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -c $< -o $@
 
 all :: $(HS_OBJS)
 
+# Most single-module tests are declared to be module ShouldCompile, so we
+# can clean the .hi files in one go:
+CLEAN_FILES += ShouldCompile.hi
diff --git a/ghc/tests/mk/should_fail.mk b/ghc/tests/mk/should_fail.mk
index 17b10e6..ab201a9 100644
--- a/ghc/tests/mk/should_fail.mk
+++ b/ghc/tests/mk/should_fail.mk
@@ -1,4 +1,5 @@
 #-----------------------------------------------------------------------------
+# $Id: should_fail.mk,v 1.4 2000/11/03 16:23:38 simonmar Exp $
 # template for should_fail tests
 
 HS_SRCS = $(wildcard *.hs)
@@ -12,3 +13,6 @@ SRC_RUNTEST_OPTS += -x 1 \
 	@$(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -c $< -o $@
 
 all :: $(HS_OBJS)
+
+# occasionally a test goes wrong and compiles by mistake, so...
+CLEAN_FILES += ShouldFail.hi
diff --git a/ghc/tests/mk/should_run.mk b/ghc/tests/mk/should_run.mk
index eb0336b..d9b5e68 100644
--- a/ghc/tests/mk/should_run.mk
+++ b/ghc/tests/mk/should_run.mk
@@ -17,4 +17,4 @@ all :: $(RUNTESTS)
 %.bin : %.o
 	$(HC) $(HC_OPTS) $($*_LD_OPTS) $< -o $@
 
-CLEAN_FILES += $(BINS)
+CLEAN_FILES += $(BINS) Main.hi
diff --git a/ghc/tests/programs/Makefile b/ghc/tests/programs/Makefile
index f832adb..accac81 100644
--- a/ghc/tests/programs/Makefile
+++ b/ghc/tests/programs/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.7 2000/04/11 11:53:47 simonmar Exp $
+# $Id: Makefile,v 1.8 2000/11/03 16:23:38 simonmar Exp $
 #
 # (c) The GHC Team, 1999-2000
 #
@@ -22,7 +22,7 @@ NOT_THESE += north_lias
 #	Deliberately causes divide by zero, and
 #	we can't catch that yet
 
-NOT_THESE += andy_cherry barton-mangler-bug callback cvh_unboxing dmgob_native1 dmgob_native2 fast2haskell fexport jtod_circint okeefe_neural
+NOT_THESE += andy_cherry barton-mangler-bug cvh_unboxing dmgob_native1 dmgob_native2 fast2haskell fexport jtod_circint okeefe_neural
 #	doesn't compile
 
 NOT_THESE += jeff-bug lennart_array
diff --git a/ghc/tests/programs/callback/Makefile b/ghc/tests/programs/callback/Makefile
index 8eb5c96..a826efd 100644
--- a/ghc/tests/programs/callback/Makefile
+++ b/ghc/tests/programs/callback/Makefile
@@ -1,9 +1,11 @@
+#-----------------------------------------------------------------------------
+# $Id
+
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_HC_OPTS += -fglasgow-exts
-
-CC = $(HC)
+SRC_HC_OPTS += -fglasgow-exts -fvia-C
+SRC_LD_OPTS += Main_stub.o
 
 all :: runtest
 
diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile
index ac9ca82..a7bb484 100644
--- a/ghc/tests/reader/should_compile/Makefile
+++ b/ghc/tests/reader/should_compile/Makefile
@@ -10,4 +10,6 @@ read014_HC_OPTS += -Wall
 read022_HC_OPTS = -fglasgow-exts
 read024_HC_OPTS = -fglasgow-exts
 
+CLEAN_FILES += T1.hi T2.hi MyList.hi
+
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/reader/should_compile/MyList.hi b/ghc/tests/reader/should_compile/MyList.hi
deleted file mode 100644
index 07777f3..0000000
--- a/ghc/tests/reader/should_compile/MyList.hi
+++ /dev/null
@@ -1,5 +0,0 @@
-__interface MyList 1 0 where
-__export MyList MyList{Empty ZCZCZC};
-import PrelBase 16 :: addr2Integer 1 foldr 1 int2Integer 1 integer_0 1 integer_1 1 integer_2 1 integer_m1 1;
-import PrelPack 15 :: packCStringzh 1 unpackAppendCStringzh 1 unpackCStringzh 1 unpackFoldrCStringzh 1 unpackNByteszh 1;
-2 data MyList a = Empty |  ZCZCZC (MyList a) (MyList a) ;
diff --git a/ghc/tests/reader/should_compile/read002.hs b/ghc/tests/reader/should_compile/read002.hs
index 0d26eb7..5b069fe 100644
--- a/ghc/tests/reader/should_compile/read002.hs
+++ b/ghc/tests/reader/should_compile/read002.hs
@@ -1,5 +1,5 @@
 -- !!! tests fixity reading and printing
-module Reader where
+module ShouldCompile where
 
 infixl 1 `f`
 infixr 2 \\\
diff --git a/ghc/tests/reader/should_compile/read003.hs b/ghc/tests/reader/should_compile/read003.hs
index d0e5206..afc3a21 100644
--- a/ghc/tests/reader/should_compile/read003.hs
+++ b/ghc/tests/reader/should_compile/read003.hs
@@ -1,5 +1,5 @@
 -- !!! Testing layout rule
-module Layout where
+module ShouldCompile where
 
 l1 :: IO ()
 l1 = do
diff --git a/ghc/tests/reader/should_compile/read004.hs b/ghc/tests/reader/should_compile/read004.hs
index f21bb12..0741d0c 100644
--- a/ghc/tests/reader/should_compile/read004.hs
+++ b/ghc/tests/reader/should_compile/read004.hs
@@ -1,4 +1,4 @@
-module ShouldFail where
+module ShouldCompile where
 
 {-
 From: Kevin Hammond <kh>
diff --git a/ghc/tests/reader/should_compile/read005.hs b/ghc/tests/reader/should_compile/read005.hs
index e02b3d0..6e2c575 100644
--- a/ghc/tests/reader/should_compile/read005.hs
+++ b/ghc/tests/reader/should_compile/read005.hs
@@ -1,2 +1,4 @@
+module ShouldCompile where
+
 -- !!! Empty comments terminating a file..
 main = print "Hello" --
diff --git a/ghc/tests/reader/should_compile/read005.stderr b/ghc/tests/reader/should_compile/read005.stderr
deleted file mode 100644
index 482b571..0000000
--- a/ghc/tests/reader/should_compile/read005.stderr
+++ /dev/null
@@ -1 +0,0 @@
-Haskell compiler received signal 2
diff --git a/ghc/tests/reader/should_compile/read006.hs b/ghc/tests/reader/should_compile/read006.hs
index bb26ed0..f04b29b 100644
--- a/ghc/tests/reader/should_compile/read006.hs
+++ b/ghc/tests/reader/should_compile/read006.hs
@@ -3,4 +3,3 @@ module MyList (MyList(Empty, (:::))) where
 
 data MyList a =   Empty
                 | (MyList a) ::: (MyList a)
-
diff --git a/ghc/tests/reader/should_compile/read007.hs b/ghc/tests/reader/should_compile/read007.hs
index a651883..55a4332 100644
--- a/ghc/tests/reader/should_compile/read007.hs
+++ b/ghc/tests/reader/should_compile/read007.hs
@@ -1,4 +1,4 @@
-module User where
+module ShouldCompile where
 
 import MyList
 
diff --git a/ghc/tests/reader/should_compile/read008.hs b/ghc/tests/reader/should_compile/read008.hs
index 12e2bb6..20060b0 100644
--- a/ghc/tests/reader/should_compile/read008.hs
+++ b/ghc/tests/reader/should_compile/read008.hs
@@ -1,4 +1,4 @@
-module ShouldSucceed where
+module ShouldCompile where
 
 {-# SPECIALISE f :: Int -> Int #-}
 f n = n + 1
diff --git a/ghc/tests/reader/should_compile/read009.hs b/ghc/tests/reader/should_compile/read009.hs
index 588aae8..5294012 100644
--- a/ghc/tests/reader/should_compile/read009.hs
+++ b/ghc/tests/reader/should_compile/read009.hs
@@ -1,5 +1,5 @@
 -- !!! combining undeclared infix operators
-module ShouldSucceed where
+module ShouldCompile where
 
 -- should default to 'infixl 9'
 
diff --git a/ghc/tests/reader/should_compile/read010.hs b/ghc/tests/reader/should_compile/read010.hs
index 579152b..d20f5fc 100644
--- a/ghc/tests/reader/should_compile/read010.hs
+++ b/ghc/tests/reader/should_compile/read010.hs
@@ -1,4 +1,4 @@
 -- !!! Infix record constructor.
-module ShouldSucceed where
+module ShouldCompile where
 
 data Rec = (:<-:) { a :: Int, b :: Float }
diff --git a/ghc/tests/reader/should_compile/read011.hs b/ghc/tests/reader/should_compile/read011.hs
index fec644b..7e20d46 100644
--- a/ghc/tests/reader/should_compile/read011.hs
+++ b/ghc/tests/reader/should_compile/read011.hs
@@ -1,5 +1,5 @@
 -- !!! do & where interaction
-module ShouldSucceed where
+module ShouldCompile where
 
 f1 :: IO a -> IO [a]
 f1 x = do
diff --git a/ghc/tests/reader/should_compile/read014.hs b/ghc/tests/reader/should_compile/read014.hs
index b8bfe7f..55fc053 100644
--- a/ghc/tests/reader/should_compile/read014.hs
+++ b/ghc/tests/reader/should_compile/read014.hs
@@ -1,5 +1,5 @@
 -- !!! Empty export lists are legal (and useful.)
-module T () where
+module ShouldCompile () where
 
 ng1 x y = negate y
 
diff --git a/ghc/tests/reader/should_compile/read015.hs b/ghc/tests/reader/should_compile/read015.hs
index 2cee2da..7ba6140 100644
--- a/ghc/tests/reader/should_compile/read015.hs
+++ b/ghc/tests/reader/should_compile/read015.hs
@@ -1,2 +1,2 @@
 -- !!! Testing whether the parser likes empty declarations..
-module M where { ;;;;;x=let{;;;;;y=2;;;;}in y;;;;;}
+module ShouldCompile where { ;;;;;x=let{;;;;;y=2;;;;}in y;;;;;}
diff --git a/ghc/tests/reader/should_compile/read016.hs b/ghc/tests/reader/should_compile/read016.hs
index a2f4311..c333c40 100644
--- a/ghc/tests/reader/should_compile/read016.hs
+++ b/ghc/tests/reader/should_compile/read016.hs
@@ -1,6 +1,6 @@
 -- !!! Checking that both import lists and 'hiding' lists might
 -- !!! be empty.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List  ()
 import List  hiding ()
diff --git a/ghc/tests/reader/should_compile/read017.hs b/ghc/tests/reader/should_compile/read017.hs
index e87fede..4349cb2 100644
--- a/ghc/tests/reader/should_compile/read017.hs
+++ b/ghc/tests/reader/should_compile/read017.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that empty declarations are permitted.
-module ShouldSucceed where
+module ShouldCompile where
 
 
 class Foo a where
diff --git a/ghc/tests/reader/should_compile/read018.hs b/ghc/tests/reader/should_compile/read018.hs
index ed3f07d..e4abfb6 100644
--- a/ghc/tests/reader/should_compile/read018.hs
+++ b/ghc/tests/reader/should_compile/read018.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that empty contexts are permitted.
-module ShouldSucceed where
+module ShouldCompile where
 
 data () => Foo a = Foo a
 
diff --git a/ghc/tests/reader/should_compile/read019.hs b/ghc/tests/reader/should_compile/read019.hs
index 2ba776d..3de6a9b 100644
--- a/ghc/tests/reader/should_compile/read019.hs
+++ b/ghc/tests/reader/should_compile/read019.hs
@@ -1,5 +1,5 @@
 -- !!! Checking what's legal in the body of a class declaration.
-module ShouldSucceed where
+module ShouldCompile where
 
 class Foo a where {
   (--<>--) :: a -> a -> Int  ;
diff --git a/ghc/tests/reader/should_compile/read020.hs b/ghc/tests/reader/should_compile/read020.hs
index ea6c04d..50efcf3 100644
--- a/ghc/tests/reader/should_compile/read020.hs
+++ b/ghc/tests/reader/should_compile/read020.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that qualified method names are legal in instance body.
-module ShouldSucceed where
+module ShouldCompile where
 
 import Prelude hiding (Eq, (==))
 import Prelude as P (Eq,(==))
diff --git a/ghc/tests/reader/should_compile/read021.hs b/ghc/tests/reader/should_compile/read021.hs
index b515df2..8d5856e 100644
--- a/ghc/tests/reader/should_compile/read021.hs
+++ b/ghc/tests/reader/should_compile/read021.hs
@@ -1,6 +1,6 @@
 -- !!! Empty export list
 
-module Reader() where
+module ShouldCompile() where
 
 instance Show (a->b) where
   show f = "<<function>>"
diff --git a/ghc/tests/rename/should_compile/Makefile b/ghc/tests/rename/should_compile/Makefile
index 45b95af..9614587 100644
--- a/ghc/tests/rename/should_compile/Makefile
+++ b/ghc/tests/rename/should_compile/Makefile
@@ -11,6 +11,9 @@ SRC_HC_OPTS += -dcore-lint
 # rn025_HC_OPTS = -hi -hi-with-exports
 # Rn037Help_HC_OPTS = -hi
 
+CLEAN_FILES += Confused.hi Foo.hi Imp10.hi Imp100.hi Imp1000.hi \
+	Imp500.hi Main.hi Mod10.hi OK.hi ShouldSucceed.hi Silly.hi Test.hi
+
 include $(TOP)/mk/target.mk
 
 
diff --git a/ghc/tests/rename/should_compile/rn025.hs b/ghc/tests/rename/should_compile/rn025.hs
index 2d4838c..9eb64e0 100644
--- a/ghc/tests/rename/should_compile/rn025.hs
+++ b/ghc/tests/rename/should_compile/rn025.hs
@@ -1,5 +1,5 @@
 -- !!! Re-exporting a module whose contents is partially hidden.
-module ShouldSucceed ( module List ) where
+module ShouldCompile ( module List ) where
 
 import List hiding ( sort )
 
diff --git a/ghc/tests/rename/should_compile/rn026.hs b/ghc/tests/rename/should_compile/rn026.hs
index ff705b6..fdba3a8 100644
--- a/ghc/tests/rename/should_compile/rn026.hs
+++ b/ghc/tests/rename/should_compile/rn026.hs
@@ -1,6 +1,6 @@
 -- !!! Checking that more than imported module can share a local
 -- !!! local alias.
-module ShouldSucceed where
+module ShouldCompile where
 
 import qualified List  as X
 import qualified Maybe as X
diff --git a/ghc/tests/rename/should_compile/rn027.hs b/ghc/tests/rename/should_compile/rn027.hs
index c773f91..e9bd760 100644
--- a/ghc/tests/rename/should_compile/rn027.hs
+++ b/ghc/tests/rename/should_compile/rn027.hs
@@ -1,6 +1,6 @@
 -- !!! Checking that an imported module may still have
 -- !!! a local alias without having used 'qualified'.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List  as X
 import Maybe as X
diff --git a/ghc/tests/rename/should_compile/rn028.hs b/ghc/tests/rename/should_compile/rn028.hs
index 82438e8..16e31a4 100644
--- a/ghc/tests/rename/should_compile/rn028.hs
+++ b/ghc/tests/rename/should_compile/rn028.hs
@@ -1,7 +1,7 @@
 -- !!! Checking that a toplevel declaration 'f' in module M is accessible
 -- !!! as both 'f' and 'M.f' within the scope of M. Similarly for imported
 -- !!! entities.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List ( sort )
 
@@ -12,7 +12,7 @@ y :: Int
 y = x
 
 z :: Int
-z = ShouldSucceed.x
+z = ShouldCompile.x
 
 sortOf :: Ord a=> [a] -> [a]
 sortOf = List.sort
diff --git a/ghc/tests/rename/should_compile/rn029.hs b/ghc/tests/rename/should_compile/rn029.hs
index 354fef5..5b87602 100644
--- a/ghc/tests/rename/should_compile/rn029.hs
+++ b/ghc/tests/rename/should_compile/rn029.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that lazy name clashing works.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List ( reverse, sort )
 
@@ -10,7 +10,7 @@ sort = 4	-- but never used, so OK
 reverse :: Int	-- Clashes with List.reverse, 
 reverse = 3	-- but the only uses are qualified
 
-x = ShouldSucceed.reverse
+x = ShouldCompile.reverse
 
 y = List.reverse
 
diff --git a/ghc/tests/rename/should_compile/rn030.hs b/ghc/tests/rename/should_compile/rn030.hs
index ff705b6..fdba3a8 100644
--- a/ghc/tests/rename/should_compile/rn030.hs
+++ b/ghc/tests/rename/should_compile/rn030.hs
@@ -1,6 +1,6 @@
 -- !!! Checking that more than imported module can share a local
 -- !!! local alias.
-module ShouldSucceed where
+module ShouldCompile where
 
 import qualified List  as X
 import qualified Maybe as X
diff --git a/ghc/tests/rename/should_compile/rn031.hs b/ghc/tests/rename/should_compile/rn031.hs
index 4ffeaca..bea26c0 100644
--- a/ghc/tests/rename/should_compile/rn031.hs
+++ b/ghc/tests/rename/should_compile/rn031.hs
@@ -1,6 +1,6 @@
 -- !!! Checking that an imported module may still have
 -- !!! a local alias without having used 'qualified'.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List  as X
 import Maybe as X
diff --git a/ghc/tests/rename/should_compile/rn032.hs b/ghc/tests/rename/should_compile/rn032.hs
index 82438e8..16e31a4 100644
--- a/ghc/tests/rename/should_compile/rn032.hs
+++ b/ghc/tests/rename/should_compile/rn032.hs
@@ -1,7 +1,7 @@
 -- !!! Checking that a toplevel declaration 'f' in module M is accessible
 -- !!! as both 'f' and 'M.f' within the scope of M. Similarly for imported
 -- !!! entities.
-module ShouldSucceed where
+module ShouldCompile where
 
 import List ( sort )
 
@@ -12,7 +12,7 @@ y :: Int
 y = x
 
 z :: Int
-z = ShouldSucceed.x
+z = ShouldCompile.x
 
 sortOf :: Ord a=> [a] -> [a]
 sortOf = List.sort
diff --git a/ghc/tests/rename/should_compile/rn033.hs b/ghc/tests/rename/should_compile/rn033.hs
index 62aba91..87589e9 100644
--- a/ghc/tests/rename/should_compile/rn033.hs
+++ b/ghc/tests/rename/should_compile/rn033.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that lazy name clashing works
-module ShouldSucceed where
+module ShouldCompile where
 
 import List ( sort )
 
@@ -7,7 +7,7 @@ sort :: Int
 sort = 3
 
 foo :: Int
-foo = ShouldSucceed.sort
+foo = ShouldCompile.sort
 
 baz :: (Ord a) => [a] -> [a]
 baz = List.sort
diff --git a/ghc/tests/rename/should_compile/rn034.hs b/ghc/tests/rename/should_compile/rn034.hs
index 3117391..b8fc047 100644
--- a/ghc/tests/rename/should_compile/rn034.hs
+++ b/ghc/tests/rename/should_compile/rn034.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that empty declarations are permitted.
-module ShouldSucceed where
+module ShouldCompile where
 
 
 class Foo a where
diff --git a/ghc/tests/rename/should_compile/rn035.hs b/ghc/tests/rename/should_compile/rn035.hs
index 2ba776d..3de6a9b 100644
--- a/ghc/tests/rename/should_compile/rn035.hs
+++ b/ghc/tests/rename/should_compile/rn035.hs
@@ -1,5 +1,5 @@
 -- !!! Checking what's legal in the body of a class declaration.
-module ShouldSucceed where
+module ShouldCompile where
 
 class Foo a where {
   (--<>--) :: a -> a -> Int  ;
diff --git a/ghc/tests/rename/should_compile/rn036.hs b/ghc/tests/rename/should_compile/rn036.hs
index ea6c04d..50efcf3 100644
--- a/ghc/tests/rename/should_compile/rn036.hs
+++ b/ghc/tests/rename/should_compile/rn036.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that qualified method names are legal in instance body.
-module ShouldSucceed where
+module ShouldCompile where
 
 import Prelude hiding (Eq, (==))
 import Prelude as P (Eq,(==))
diff --git a/ghc/tests/rename/should_compile/rn037.hs b/ghc/tests/rename/should_compile/rn037.hs
index 668d707..bd9a9b6 100644
--- a/ghc/tests/rename/should_compile/rn037.hs
+++ b/ghc/tests/rename/should_compile/rn037.hs
@@ -1,5 +1,5 @@
 -- !!! Checking that you can hide a constructor
-module ShouldSucceed where
+module ShouldCompile where
 
 import Rn037Help hiding( C )
 	-- C is the constructor, but we should
diff --git a/ghc/tests/simplCore/should_compile/simpl001.hs b/ghc/tests/simplCore/should_compile/simpl001.hs
index 9b3adc5..4b2bfcc 100644
--- a/ghc/tests/simplCore/should_compile/simpl001.hs
+++ b/ghc/tests/simplCore/should_compile/simpl001.hs
@@ -3,7 +3,7 @@
 -- only tickled by the simplifier
 
 -- type Foo a b = a -> (b -> a) -> b
-module Test where
+module ShouldCompile where
 
 (++++) :: (a -> (b -> a) -> b) -> (a -> (b -> a) -> b) -> a -> (b -> a) -> b
 x ++++ y = y
diff --git a/ghc/tests/simplCore/should_compile/simpl002.hs b/ghc/tests/simplCore/should_compile/simpl002.hs
index 58e072f..b262f47 100644
--- a/ghc/tests/simplCore/should_compile/simpl002.hs
+++ b/ghc/tests/simplCore/should_compile/simpl002.hs
@@ -1,6 +1,6 @@
 -- !!! class/instance mumble that failed Lint at one time
 --
-module Test where
+module ShouldCompile where
 class Foo a where
    op :: Int -> a -> Bool
 
diff --git a/ghc/tests/simplCore/should_compile/simpl003.hs b/ghc/tests/simplCore/should_compile/simpl003.hs
index 3cd1af4..2f36696 100644
--- a/ghc/tests/simplCore/should_compile/simpl003.hs
+++ b/ghc/tests/simplCore/should_compile/simpl003.hs
@@ -5,7 +5,7 @@ From: Julian Seward (DRL PhD) <sewardj@computer-science.manchester.ac.uk>
 Message-Id: <9412081138.AA16652@rdf009.cs.man.ac.uk>
 To: partain@dcs.gla.ac.uk
 -}
-module ShouldFail where
+module ShouldCompile where
 
 type IMonad a
    = IMonadState -> IMonadReturn a
-- 
1.7.10.4