[project @ 2004-09-09 16:15:24 by igloo]

Testsuite cleaning.

61 files changed, 107 insertions, 4 deletions

diff --git a/testsuite/tests/ghc-regress/ccall/should_run/all.T b/testsuite/tests/ghc-regress/ccall/should_run/all.T
index 0155b025f1..0d096470cb 100644
--- a/testsuite/tests/ghc-regress/ccall/should_run/all.T
+++ b/testsuite/tests/ghc-regress/ccall/should_run/all.T
@@ -15,6 +15,7 @@ test('fed001', expect_fail_for(['extcore','optextcore']), compile_and_run, [''])
 # Omit GHCi for these two, as they use foreign export
 test('ffi001', omit_ways(['ghci']), compile_and_run, [''])
 test('ffi002', omit_ways(['ghci']), compile_and_run, ['ffi002_c.c -no-hs-main'])
+clean(['ffi002_c.o'])
 
 if config.platform == 'alpha-dec-osf3':
 	f = skip
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
index 0912488e91..69598c7182 100644
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
@@ -4,5 +4,6 @@ def f( opts ):
 
 setTestOpts(f)
 
-test('Cpr001_imp', normal, compile, [''])
+test('Cpr001_imp', no_clean, compile, [''])
 test('Cpr001', normal, compile, [''])
+clean(['Cpr001_imp.hi', 'Cpr001_imp.o', 'Cpr001_imp.comp.stderr'])
diff --git a/testsuite/tests/ghc-regress/driver/all.T b/testsuite/tests/ghc-regress/driver/all.T
index ef07bf2737..34870d54c9 100644
--- a/testsuite/tests/ghc-regress/driver/all.T
+++ b/testsuite/tests/ghc-regress/driver/all.T
@@ -23,3 +23,10 @@ test('driver060', normal, run_command_ignore_output, ['$MAKE test060'])
 test('driver061', normal, run_command_ignore_output, ['$MAKE test061'])
 test('driver062', normal, run_command_ignore_output, ['$MAKE test062'])
 test('driver063', normal, run_command, ['$MAKE -s --no-print-directory test063'])
+clean(['B/C.hi', 'B/C.o', 'B/C.ooo', 'B/C.xhi',
+       'd1/P/Q.o', 'd2/R/S.o', 'd1/P/Q.hi', 'd2/R/S.hi',
+       'A.ooo', 'A.xhi', 'Hello.hi', 'Hello.o', 'hello'])
+
+if default_testopts.cleanup != '':
+    os.spawnlp(os.P_WAIT, 'rm', 'rm', '-rf', in_testdir('obj'))
+    os.spawnlp(os.P_WAIT, 'rm', 'rm', '-rf', in_testdir('hi'))
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/prog001.T b/testsuite/tests/ghc-regress/ghci/prog001/prog001.T
index a95ffe9acf..a913a8e374 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/prog001.T
+++ b/testsuite/tests/ghc-regress/ghci/prog001/prog001.T
@@ -1 +1,3 @@
 test('prog001', normal, ghci_script, ['prog001.script'])
+clean(['D.hi', 'D.o'])
+
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/prog002.T b/testsuite/tests/ghc-regress/ghci/prog002/prog002.T
index 724febaae8..0c270e00aa 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/prog002.T
+++ b/testsuite/tests/ghc-regress/ghci/prog002/prog002.T
@@ -1 +1,3 @@
 test('prog002', normal, ghci_script, ['prog002.script'])
+clean(['A.hi'])
+
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T b/testsuite/tests/ghc-regress/ghci/prog003/prog003.T
index ab03ea6f73..f87ebb689b 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T
+++ b/testsuite/tests/ghc-regress/ghci/prog003/prog003.T
@@ -1 +1,3 @@
 test('prog003', normal, ghci_script, ['prog003.script'])
+clean(['D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', 'A.hi', 'A.o', 'a.out'])
+
diff --git a/testsuite/tests/ghc-regress/lib/Generics/bits/test.T b/testsuite/tests/ghc-regress/lib/Generics/bits/test.T
index 575b89603e..55d5dfc3e2 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/bits/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/bits/test.T
@@ -3,3 +3,4 @@ test( 'bits',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/ext1/test.T b/testsuite/tests/ghc-regress/lib/Generics/ext1/test.T
index 41a3072e57..28fe1942a6 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/ext1/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/ext1/test.T
@@ -3,3 +3,4 @@ test( 'ext1',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/freeNames/test.T b/testsuite/tests/ghc-regress/lib/Generics/freeNames/test.T
index 3a70b6fae6..195d70fd30 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/freeNames/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/freeNames/test.T
@@ -3,3 +3,4 @@ test( 'freeNames',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['FunDatatypes.hi', 'FunDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/genUpTo/test.T b/testsuite/tests/ghc-regress/lib/Generics/genUpTo/test.T
index 56d1566a7e..d6a5f751dc 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/genUpTo/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/genUpTo/test.T
@@ -3,3 +3,4 @@ test( 'genUpTo',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['LittleLanguage.hi', 'LittleLanguage.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/geq/test.T b/testsuite/tests/ghc-regress/lib/Generics/geq/test.T
index 4acf45986b..f4e21907cf 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/geq/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/geq/test.T
@@ -3,3 +3,4 @@ test( 'geq',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/gshow/test.T b/testsuite/tests/ghc-regress/lib/Generics/gshow/test.T
index 658229d85e..3f636bf0e8 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/gshow/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/gshow/test.T
@@ -3,3 +3,4 @@ test( 'gshow',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/gzip/test.T b/testsuite/tests/ghc-regress/lib/Generics/gzip/test.T
index e0e2ba40af..0bf928ccc0 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/gzip/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/gzip/test.T
@@ -3,3 +3,4 @@ test( 'gzip',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/paradise/test.T b/testsuite/tests/ghc-regress/lib/Generics/paradise/test.T
index 8ad53a5e68..d4f6d7715e 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/paradise/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/paradise/test.T
@@ -3,3 +3,4 @@ test( 'paradise',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/reify/test.T b/testsuite/tests/ghc-regress/lib/Generics/reify/test.T
index d4335ade90..69446eb0a1 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/reify/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/reify/test.T
@@ -3,3 +3,4 @@ test( 'reify',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/strings/test.T b/testsuite/tests/ghc-regress/lib/Generics/strings/test.T
index 6ee48ba936..9740ab3538 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/strings/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/strings/test.T
@@ -3,3 +3,4 @@ test( 'strings',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/tree/test.T b/testsuite/tests/ghc-regress/lib/Generics/tree/test.T
index 2713b5f102..169fb58a0c 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/tree/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/tree/test.T
@@ -3,3 +3,4 @@ test( 'tree',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/xmlish/test.T b/testsuite/tests/ghc-regress/lib/Generics/xmlish/test.T
index 39bfcb1f0c..f47abd77dd 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/xmlish/test.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/xmlish/test.T
@@ -3,3 +3,4 @@ test( 'xmlish',
       multimod_compile_and_run,
       ['Main','']
     )
+clean(['CompanyDatatypes.hi', 'CompanyDatatypes.o', 'Main.hi', 'Main.o'])
diff --git a/testsuite/tests/ghc-regress/lib/IO/all.T b/testsuite/tests/ghc-regress/lib/IO/all.T
index bb25ed81d4..24e8d41993 100644
--- a/testsuite/tests/ghc-regress/lib/IO/all.T
+++ b/testsuite/tests/ghc-regress/lib/IO/all.T
@@ -8,9 +8,12 @@ test('IOError001', compose(omit_ways(['ghci']), set_stdin('IOError001.hs')),
 test('IOError002',      normal, compile_and_run, [''])
 test('finalization001', normal, compile_and_run, [''])
 test('hClose001',       normal, compile_and_run, [''])
+clean(['hClose001.tmp'])
 test('hFileSize001',    normal, compile_and_run, [''])
 test('hFileSize002',    omit_ways(['ghci']), compile_and_run, [''])
+clean(['hFileSize002.out'])
 test('hFlush001',       normal, compile_and_run, [''])
+clean(['hFlush001.out'])
 
 test('hGetBuffering001', 
 	compose(omit_ways(['ghci']), set_stdin('hGetBuffering001.hs')), 
@@ -21,8 +24,10 @@ test('hGetLine001', set_stdin('hGetLine001.hs'), compile_and_run, ['-cpp'])
 test('hGetLine002', normal, compile_and_run, [''])
 test('hGetLine003', normal, compile_and_run, [''])
 test('hGetPosn001', normal, compile_and_run, ['-cpp'])
+clean(['hGetPosn001.out'])
 test('hIsEOF001',   normal, compile_and_run, [''])
 test('hIsEOF002',   normal, compile_and_run, ['-cpp'])
+clean(['hIsEOF002.out'])
 
 # hReady doesn't work at the end of a file in GHC
 test('hReady001', expect_fail, compile_and_run, ['-cpp'])
@@ -31,6 +36,7 @@ test('hSeek001', normal, compile_and_run, ['-cpp'])
 test('hSeek002', normal, compile_and_run, ['-cpp'])
 test('hSeek003', normal, compile_and_run, ['-cpp'])
 test('hSeek004', normal, compile_and_run, ['-cpp'])
+clean(['hSeek004.out'])
 
 test('hSetBuffering002', set_stdin('hSetBuffering002.hs'), compile_and_run, [''])
 
@@ -45,19 +51,27 @@ test('isEOF001',     normal, compile_and_run, [''])
 
 test('misc001', extra_run_opts('misc001.hs misc001.out'), \
 	compile_and_run, [''])
+clean(['misc001.out'])
 
 test('openFile001',  normal, compile_and_run, [''])
 test('openFile002',  exit_code(1), compile_and_run, [''])
 test('openFile003',  normal, compile_and_run, [''])
 test('openFile004',  normal, compile_and_run, [''])
+clean(['openFile004.out'])
 test('openFile005',  expect_fail_if_windows, compile_and_run, [''])
+clean(['openFile005.out1', 'openFile005.out2'])
 test('openFile006',  normal, compile_and_run, [''])
+clean(['openFile006.out'])
 test('openFile007',  expect_fail_if_windows, compile_and_run, [''])
+clean(['openFile007.out'])
 test('putStr001',    normal, compile_and_run, [''])
 test('readFile001',  expect_fail_if_windows, compile_and_run, [''])
+clean(['readFile001.out'])
 test('readwrite001', normal, compile_and_run, ['-cpp'])
+clean(['readwrite001.inout'])
 
 test('readwrite002', compose(omit_ways(['ghci']), set_stdin('readwrite002.hs')),
 	compile_and_run, ['-cpp'])
+clean(['readwrite002.inout'])
 
 test('hGetBuf001', expect_fail_if_windows, compile_and_run, ['-package unix'])
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/all.T b/testsuite/tests/ghc-regress/lib/IOExts/all.T
index 363feda411..7415203b38 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/all.T
+++ b/testsuite/tests/ghc-regress/lib/IOExts/all.T
@@ -19,3 +19,4 @@ test('trace001', omit_ways(['opt','optasm','optextcore']), compile_and_run, ['']
 test('hGetBuf001', normal, compile_and_run, [''])
 test('hPutBuf001', normal, compile_and_run, [''])
 test('hPutBuf002', normal, compile_and_run, [''])
+clean(['hPutBuf002.out'])
diff --git a/testsuite/tests/ghc-regress/module/all.T b/testsuite/tests/ghc-regress/module/all.T
index 956b1f32c3..c60a819825 100644
--- a/testsuite/tests/ghc-regress/module/all.T
+++ b/testsuite/tests/ghc-regress/module/all.T
@@ -120,7 +120,9 @@ test('mod98', normal, compile_fail, [''])
 test('mod99', normal, compile, [''])
 test('mod100', normal, compile, [''])
 test('mod101', normal, multimod_compile_fail, ['mod101', '-v0'])
+clean(['Mod101_AuxA.hi', 'Mod101_AuxA.o', 'Mod101_AuxB.hi', 'Mod101_AuxB.o'])
 test('mod102', normal, multimod_compile_fail, ['mod102', '-v0'])
+clean(['Mod102_AuxA.hi', 'Mod102_AuxA.o', 'Mod102_AuxB.hi', 'Mod102_AuxB.o'])
 test('mod103', normal, compile, [''])
 test('mod104', normal, compile, [''])
 test('mod105', normal, compile, [''])
@@ -133,24 +135,40 @@ test('mod111', normal, compile, [''])
 test('mod112', normal, compile, [''])
 test('mod113', normal, compile, [''])
 test('mod114', normal, multimod_compile_fail, ['mod114', '-v0'])
+clean(['Mod114_Help.hi', 'Mod114_Help.o'])
 test('mod115', normal, multimod_compile, ['mod115', '-v0'])
+clean(['Mod115_A.hi', 'Mod115_A.o', 'Mod115_B.hi', 'Mod115_B.o'])
 test('mod116', normal, compile_fail, [''])
 test('mod117', normal, multimod_compile, ['mod117', '-v0'])
+clean(['Mod117_A.hi', 'Mod117_A.o', 'Mod117_B.hi', 'Mod117_B.o'])
 test('mod118', normal, multimod_compile, ['mod118', '-v0'])
+clean(['Mod118_A.hi', 'Mod118_A.o', 'Mod118_B.hi', 'Mod118_B.o'])
 test('mod119', normal, multimod_compile, ['mod119', '-v0'])
+clean(['Mod119_A.hi', 'Mod119_A.o', 'Mod119_B.hi', 'Mod119_B.o'])
 test('mod120', normal, multimod_compile_fail, ['mod120', '-v0'])
+clean(['Mod120_A.hi', 'Mod120_A.o'])
 test('mod121', normal, multimod_compile_fail, ['mod121', '-v0'])
+clean(['Mod121_A.hi', 'Mod121_A.o'])
 test('mod122', normal, multimod_compile_fail, ['mod122', '-v0'])
+clean(['Mod122_A.hi', 'Mod122_A.o'])
 test('mod123', normal, multimod_compile_fail, ['mod123', '-v0'])
+clean(['Mod123_A.hi', 'Mod123_A.o'])
 test('mod124', normal, multimod_compile_fail, ['mod124', '-v0'])
+clean(['Mod124_A.hi', 'Mod124_A.o'])
 test('mod125', normal, multimod_compile_fail, ['mod125', '-v0'])
+clean(['Mod124_A.hi', 'Mod124_A.o'])
 test('mod126', normal, multimod_compile_fail, ['mod126', '-v0'])
+clean(['Mod126_A.hi', 'Mod126_A.o'])
 test('mod127', normal, multimod_compile_fail, ['mod127', '-v0'])
+clean(['Mod126_A.hi', 'Mod126_A.o'])
 test('mod128', normal, multimod_compile, ['mod128', '-v0'])
+clean(['Mod128_A.hi', 'Mod128_A.o'])
 test('mod129', normal, compile, [''])
 test('mod130', normal, compile_fail, [''])
 test('mod131', normal, multimod_compile_fail, ['mod131', '-v0'])
+clean(['Mod131_A.hi', 'Mod131_A.o', 'Mod131_B.hi', 'Mod131_B.o'])
 test('mod132', normal, multimod_compile_fail, ['mod132', '-v0'])
+clean(['Mod132_A.hi', 'Mod132_A.o', 'Mod132_B.hi', 'Mod132_B.o'])
 test('mod133', normal, compile, [''])
 test('mod134', normal, compile_fail, [''])
 
diff --git a/testsuite/tests/ghc-regress/parser/prog001/test.T b/testsuite/tests/ghc-regress/parser/prog001/test.T
index 148db7a7e2..42d65f2d96 100644
--- a/testsuite/tests/ghc-regress/parser/prog001/test.T
+++ b/testsuite/tests/ghc-regress/parser/prog001/test.T
@@ -1,2 +1,3 @@
 test('parser.prog001', normal, multimod_compile, \
   ['Read007', '-v0'])
+clean(['Read006.hi', 'Read006.o', 'Read007.hi', 'Read007.o'])
diff --git a/testsuite/tests/ghc-regress/programs/10queens/test.T b/testsuite/tests/ghc-regress/programs/10queens/test.T
index f9fda0d4e9..0e7d2b0d47 100644
--- a/testsuite/tests/ghc-regress/programs/10queens/test.T
+++ b/testsuite/tests/ghc-regress/programs/10queens/test.T
@@ -1,2 +1,3 @@
 
 test('10queens', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
diff --git a/testsuite/tests/ghc-regress/programs/andre_monad/test.T b/testsuite/tests/ghc-regress/programs/andre_monad/test.T
index 9ca1884164..901007c2a1 100644
--- a/testsuite/tests/ghc-regress/programs/andre_monad/test.T
+++ b/testsuite/tests/ghc-regress/programs/andre_monad/test.T
@@ -1,3 +1,4 @@
 
 test('andre_monad', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/test.T b/testsuite/tests/ghc-regress/programs/andy_cherry/test.T
index 308ab0cd89..677ef66f18 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/test.T
+++ b/testsuite/tests/ghc-regress/programs/andy_cherry/test.T
@@ -1,4 +1,5 @@
 
 test('andy_cherry', extra_run_opts('.'), multimod_compile_and_run, \
 	['Main', '-cpp'])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T
index 648439e399..84ef67c84d 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T
+++ b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T
@@ -1,3 +1,4 @@
 # Expect failure when running the optasm way, due to floating-point
 # differences.
 test('barton-mangler-bug', expect_fail_for(['optasm']), multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T b/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T
index e9a107ec73..653d0ef64b 100644
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T
+++ b/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T
@@ -1,3 +1,4 @@
 # Expect failure when running the optasm way, due to floating-point
 # differences.
 test('cholewo-eval', expect_fail_for(['optasm']), multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T b/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T
index 4d4aed7ea5..e65f1eeb39 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T
+++ b/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T
@@ -1,4 +1,5 @@
 
 test('cvh_unboxing', normal, multimod_compile_and_run, \
 	['Main', '-fglasgow-exts'])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/test.T b/testsuite/tests/ghc-regress/programs/fast2haskell/test.T
index d2c8575d1c..83396c84ad 100644
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/test.T
+++ b/testsuite/tests/ghc-regress/programs/fast2haskell/test.T
@@ -1,4 +1,5 @@
 
 test('fast2haskell', normal, multimod_compile_and_run, \
 	['Main', '-fglasgow-exts -package lang'])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/fun_insts/test.T b/testsuite/tests/ghc-regress/programs/fun_insts/test.T
index 819d72e394..ca7ddf5cb0 100644
--- a/testsuite/tests/ghc-regress/programs/fun_insts/test.T
+++ b/testsuite/tests/ghc-regress/programs/fun_insts/test.T
@@ -1,3 +1,4 @@
 
 test('fun_insts', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T b/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T
index f9bb7a7fd4..b087e06aee 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T
+++ b/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T
@@ -6,4 +6,5 @@ test('galois_raytrace', \
 	compose(omit_ways(['normal']), expect_fail_for(['optasm'])), \
 	multimod_compile_and_run, \
 	['Main', '-O -package lang -package text'])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/test.T b/testsuite/tests/ghc-regress/programs/jl_defaults/test.T
index 85951c3346..9249f5de66 100644
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/test.T
+++ b/testsuite/tests/ghc-regress/programs/jl_defaults/test.T
@@ -1,3 +1,4 @@
 
 test('jl_defaults', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/test.T b/testsuite/tests/ghc-regress/programs/joao-circular/test.T
index 285b4654e5..e8013b9563 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/test.T
+++ b/testsuite/tests/ghc-regress/programs/joao-circular/test.T
@@ -1 +1,2 @@
 test('joao-circular', extra_run_opts('inp 40'), multimod_compile_and_run, ['Main', '-O'])
+clean_o_hi()
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T b/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T
index c78e7bbb16..efe278c232 100644
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T
+++ b/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T
@@ -1,3 +1,4 @@
 
 test('jq_readsPrec', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/test.T b/testsuite/tests/ghc-regress/programs/jtod_circint/test.T
index 45a1bb2aff..5b9c9af7ae 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/test.T
+++ b/testsuite/tests/ghc-regress/programs/jtod_circint/test.T
@@ -1,3 +1,4 @@
 
 test('jtod_circint', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/test.T b/testsuite/tests/ghc-regress/programs/jules_xref/test.T
index 77394efec8..793b6b151b 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref/test.T
+++ b/testsuite/tests/ghc-regress/programs/jules_xref/test.T
@@ -1,3 +1,4 @@
 
 test('jules_xref', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/test.T b/testsuite/tests/ghc-regress/programs/jules_xref2/test.T
index 58e9c6c496..ca0678b0fd 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/test.T
+++ b/testsuite/tests/ghc-regress/programs/jules_xref2/test.T
@@ -1,3 +1,4 @@
 
 test('jules_xref2', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/test.T b/testsuite/tests/ghc-regress/programs/launchbury/test.T
index 0e98e12ead..ee8538f974 100644
--- a/testsuite/tests/ghc-regress/programs/launchbury/test.T
+++ b/testsuite/tests/ghc-regress/programs/launchbury/test.T
@@ -1,3 +1,4 @@
 
 test('launchbury', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/lennart_range/test.T b/testsuite/tests/ghc-regress/programs/lennart_range/test.T
index 1a2ae03cd6..aa6d32660b 100644
--- a/testsuite/tests/ghc-regress/programs/lennart_range/test.T
+++ b/testsuite/tests/ghc-regress/programs/lennart_range/test.T
@@ -1,3 +1,4 @@
 
 test('lennart_range', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/lex/test.T b/testsuite/tests/ghc-regress/programs/lex/test.T
index 0c30cbd44e..2b6f925c6c 100644
--- a/testsuite/tests/ghc-regress/programs/lex/test.T
+++ b/testsuite/tests/ghc-regress/programs/lex/test.T
@@ -1,3 +1,4 @@
 
 test('lex', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/test.T b/testsuite/tests/ghc-regress/programs/life_space_leak/test.T
index 7abc9424dc..98674f7b13 100644
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/test.T
+++ b/testsuite/tests/ghc-regress/programs/life_space_leak/test.T
@@ -1,3 +1,4 @@
 
 test('life_space_leak', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/north_array/test.T b/testsuite/tests/ghc-regress/programs/north_array/test.T
index b28b115320..41bc5c53a3 100644
--- a/testsuite/tests/ghc-regress/programs/north_array/test.T
+++ b/testsuite/tests/ghc-regress/programs/north_array/test.T
@@ -1,3 +1,4 @@
 
 test('north_array', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T b/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T
index 47ec52b96f..531c60de51 100644
--- a/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T
+++ b/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T
@@ -10,3 +10,4 @@ def set_opts( opts ):
 
 test('okeefe_neural', set_opts, multimod_compile_and_run, \
 	['Main', '-package lang +RTS -M64m -RTS'])
+clean(['Main.hi'])
diff --git a/testsuite/tests/ghc-regress/programs/record_upd/test.T b/testsuite/tests/ghc-regress/programs/record_upd/test.T
index 19f9075e2d..841e8fa98c 100644
--- a/testsuite/tests/ghc-regress/programs/record_upd/test.T
+++ b/testsuite/tests/ghc-regress/programs/record_upd/test.T
@@ -1,3 +1,4 @@
 
 test('record_upd', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/rittri/test.T b/testsuite/tests/ghc-regress/programs/rittri/test.T
index 4db14be9fb..e15c10993b 100644
--- a/testsuite/tests/ghc-regress/programs/rittri/test.T
+++ b/testsuite/tests/ghc-regress/programs/rittri/test.T
@@ -1,3 +1,4 @@
 
 test('rittri', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/test.T b/testsuite/tests/ghc-regress/programs/sanders_array/test.T
index e9faf01431..5b42c53e7d 100644
--- a/testsuite/tests/ghc-regress/programs/sanders_array/test.T
+++ b/testsuite/tests/ghc-regress/programs/sanders_array/test.T
@@ -1,3 +1,4 @@
 
 test('sanders_array', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T b/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T
index fd482a7273..fd9caf4dfb 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T
+++ b/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T
@@ -1,3 +1,4 @@
 
 test('seward-space-leak', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/strict_anns/test.T b/testsuite/tests/ghc-regress/programs/strict_anns/test.T
index d6fdd01d52..4871c1578a 100644
--- a/testsuite/tests/ghc-regress/programs/strict_anns/test.T
+++ b/testsuite/tests/ghc-regress/programs/strict_anns/test.T
@@ -1,3 +1,4 @@
 
 test('strict_anns', normal, multimod_compile_and_run, ['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T
index e48a9387fe..2aa35adf53 100644
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T
+++ b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T
@@ -1,3 +1,4 @@
 test('thurston-modular-arith', normal, multimod_compile_and_run, \
 	['Main', ''])
+clean_o_hi()
 
diff --git a/testsuite/tests/ghc-regress/rename/prog001/test.T b/testsuite/tests/ghc-regress/rename/prog001/test.T
index db77b90585..32f22729a7 100644
--- a/testsuite/tests/ghc-regress/rename/prog001/test.T
+++ b/testsuite/tests/ghc-regress/rename/prog001/test.T
@@ -1,2 +1,3 @@
 test('rename.prog001', normal, multimod_compile, \
   ['rn037', '-v0'])
+clean(['Rn037Help.hi', 'Rn037Help.o', 'rn037.hi', 'rn037.o'])
diff --git a/testsuite/tests/ghc-regress/rename/prog002/test.T b/testsuite/tests/ghc-regress/rename/prog002/test.T
index 33bd999584..dcf6a783b3 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/test.T
+++ b/testsuite/tests/ghc-regress/rename/prog002/test.T
@@ -1,2 +1,3 @@
 test('rename.prog002', normal, multimod_compile_fail, \
   ['rnfail037', '-v0'])
+clean(['Rn037Help.hi', 'Rn037Help.o'])
diff --git a/testsuite/tests/ghc-regress/rename/prog003/test.T b/testsuite/tests/ghc-regress/rename/prog003/test.T
index 4ac953d400..700386c2d4 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/test.T
+++ b/testsuite/tests/ghc-regress/rename/prog003/test.T
@@ -1,2 +1,3 @@
 test('rename.prog003', normal, multimod_compile_fail, \
   ['B', '-v0'])
+clean(['A.hi', 'A.o'])
diff --git a/testsuite/tests/ghc-regress/rename/prog004/test.T b/testsuite/tests/ghc-regress/rename/prog004/test.T
index 7c43525816..3b761a4868 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/test.T
+++ b/testsuite/tests/ghc-regress/rename/prog004/test.T
@@ -1,2 +1,3 @@
 test('rename.prog004', normal, multimod_compile, \
   ['C', '-v0'])
+clean(['A.hi', 'A.o', 'B.hi', 'B.o', 'C.hi', 'C.o'])
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/all.T b/testsuite/tests/ghc-regress/rename/should_compile/all.T
index ae3d19dbc4..1fc506b8b8 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/rename/should_compile/all.T
@@ -34,8 +34,11 @@ test('rn039', normal, compile, [''])
 test('rn040', normal, compile, ['-fwarn-unused-binds -fwarn-unused-matches'])
 test('rn041', normal, compile, [''])
 test('rn042', normal, multimod_compile, ['rn042', '-v0'])
-test('rn043', normal, multimod_compile, ['rn042', '-v0'])
-test('rn044', normal, multimod_compile, ['rn042', '-v0'])
+clean(['Rn042_A.hi', 'Rn042_A.o'])
+test('rn043', normal, multimod_compile, ['rn043', '-v0'])
+clean(['Rn043_A.hi', 'Rn043_A.o', 'Rn043_B.hi', 'Rn043_B.o'])
+test('rn044', normal, multimod_compile, ['rn044', '-v0'])
+clean(['Rn043_A.hi', 'Rn043_A.o', 'Rn043_B.hi', 'Rn043_B.o'])
 test('rn045', normal, compile, [''])
 test('rn046', normal, compile, ['-W'])
 
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/all.T b/testsuite/tests/ghc-regress/rename/should_fail/all.T
index 69a4154145..b2d80cf762 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/all.T
+++ b/testsuite/tests/ghc-regress/rename/should_fail/all.T
@@ -40,5 +40,6 @@ test('rnfail038', normal, compile_fail, [''])
 test('rnfail039', normal, compile_fail, [''])
 
 test('rnfail040', normal, multimod_compile_fail, ['rnfail040', '-v0'])
+clean(['Rnfail040_A.hi', 'Rnfail040_A.o'])
 test('rnfail041', normal, compile_fail, [''])
 test('rnfail042', normal, compile_fail, [''])
diff --git a/testsuite/tests/ghc-regress/simplCore/prog001/test.T b/testsuite/tests/ghc-regress/simplCore/prog001/test.T
index d3f08d8dfc..73bf27e19c 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog001/test.T
+++ b/testsuite/tests/ghc-regress/simplCore/prog001/test.T
@@ -1 +1,2 @@
 test('simplCore.prog001', normal, multimod_compile, ['simpl006', '-v0'])
+clean(['Simpl006Help.hi', 'Simpl006Help.o', 'simpl006.hi', 'simpl006.o'])
diff --git a/testsuite/tests/ghc-regress/simplCore/prog002/test.T b/testsuite/tests/ghc-regress/simplCore/prog002/test.T
index 886b0c9797..7679e7032b 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog002/test.T
+++ b/testsuite/tests/ghc-regress/simplCore/prog002/test.T
@@ -1,2 +1,3 @@
 test('simplCore.prog002', normal, multimod_compile, \
   ['simpl009', '-v0'])
+clean(['Simpl009Help.hi', 'Simpl009Help.o', 'simpl009.hi', 'simpl009.o'])
diff --git a/testsuite/tests/ghc-regress/th/all.T b/testsuite/tests/ghc-regress/th/all.T
index 6b49586add..4c6fadeec9 100644
--- a/testsuite/tests/ghc-regress/th/all.T
+++ b/testsuite/tests/ghc-regress/th/all.T
@@ -21,6 +21,7 @@ test('TH_reifyType2', normal, compile, [''])
 test('TH_spliceDecl1', normal, compile, ['-v0'])
 test('TH_spliceDecl2', normal, compile, ['-v0'])
 test('TH_spliceDecl3', normal, multimod_compile, ['TH_spliceDecl3', '-v0'])
+clean(['TH_spliceDecl3_Lib.hi', 'TH_spliceDecl3_Lib.o'])
 
 test('TH_spliceE1', normal, compile_and_run, [''])
 test('TH_spliceExpr1', normal, compile, ['-v0'])
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/test.T b/testsuite/tests/ghc-regress/typecheck/prog001/test.T
index 9032686cc7..14a172bf92 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/test.T
+++ b/testsuite/tests/ghc-regress/typecheck/prog001/test.T
@@ -1,3 +1,4 @@
 
 test('typecheck.prog001', normal, multimod_compile, \
 	['C', '-v0 -fglasgow-exts'])
+clean(['A.hi', 'A.o', 'B.hi', 'B.o', 'C.hi', 'C.o'])
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
index 2476473725..5eb102d1b6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
@@ -172,14 +172,16 @@ test('tc169', normal, compile, [''])
 # which we do by steam here, with a pair of tests.  Make sure
 # we run one way only, so we can be sure to have the right kind
 # of interface file for the second part of the test.
-test('Tc170_Aux', only_ways(['opt']), compile, [''])
+test('Tc170_Aux', compose(no_clean, only_ways(['opt'])), compile, [''])
 test('tc170', only_ways(['opt']), compile, [''])
+clean(['Tc170_Aux.comp.stderr', 'Tc170_Aux.hi', 'Tc170_Aux.o'])
 
 test('tc171', normal, compile, [''])
 test('tc172', normal, compile, [''])
 
 # The point about this test is that it compiles Tc173a and Tc173b *separately*
 test('tc173', normal, run_command_ignore_output, ['make tc173'])
+clean(['Tc173a.hi', 'Tc173a.o', 'Tc173b.hi', 'Tc173b.o'])
 
 test('tc174', normal, compile, [''])
 test('tc175', expect_fail, compile, [''])
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/all.T b/testsuite/tests/ghc-regress/typecheck/should_run/all.T
index 9c64d61519..46a2312d40 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/all.T
+++ b/testsuite/tests/ghc-regress/typecheck/should_run/all.T
@@ -29,6 +29,7 @@ test('tcrun022', normal, compile_and_run, ['-O -fglasgow-exts'])
 test('tcrun023', normal, compile_and_run, ['-O'])
 test('tcrun024', normal, compile_and_run, ['-O'])
 test('tcrun025', normal, multimod_compile_and_run, ['tcrun025',''])
+clean(['TcRun025_B.hi', 'TcRun025_B.o'])
 test('tcrun026', normal, compile_and_run, [''])
 test('tcrun027', normal, compile_and_run, [''])
 # Doesn't work with External Core due to datatype with no constructors