Remove uses of clean_o_hi

This makes the testsuite more resilient when using threads

testsuite/tests/ghc-regress/cabal/pkg02/Makefile

+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+

testsuite/tests/ghc-regress/cabal/pkg02/all.T

-# We can compile Network on its own (pkg02_a)
+test('pkg02',
+     [reqlib('network'),
+      extra_clean(['A.o', 'A.hi', 'Network.o', 'Network.hi'])],
+     multimod_compile,
+     ['A','-v0'])
 
-test('pkg02_a', only_ways(['normal']), multimod_compile, ['Network','-v0'])
-test('pkg02_b', reqlib('network'), multimod_compile, ['A','-v0'])
-clean_o_hi()

testsuite/tests/ghc-regress/concurrent/prog001/all.T

@@ -7,5 +7,14 @@
 # for throwTo.  It has shown up several bugs that were not caught by the 
 # other concurrency tests.
 
-test('concprog001', skip_if_fast, multimod_compile_and_run, ['Mult',''])
-clean_o_hi()
+test('concprog001',
+     [skip_if_fast,
+      extra_clean(['Arithmetic.hi', 'Arithmetic.o',
+                   'Converter.hi',  'Converter.o',
+                   'Mult.hi',       'Mult.o',
+                   'Stream.hi',     'Stream.o',
+                   'Thread.hi',     'Thread.o',
+                   'Trit.hi',       'Trit.o',
+                   'Utilities.hi',  'Utilities.o'])],
+     multimod_compile_and_run,
+     ['Mult',''])

testsuite/tests/ghc-regress/concurrent/prog002/all.T

@@ -3,8 +3,13 @@
 # the conditions are fairly delicate.  It must be compiled without optimisation,
 # hence -O0:
 
-test('concprog002', compose(only_ways(['threaded2']), 
-		    compose(exit_code(1), 
-			    skip_if_fast)), 
-	multimod_compile_and_run, ['Server','-debug -O0'])
-clean_o_hi()
+test('concprog002',
+     [only_ways(['threaded2']), 
+      exit_code(1), 
+      skip_if_fast,
+      extra_clean(['Event.hi',     'Event.o',
+                   'Scheduler.hi', 'Scheduler.o',
+                   'Server.hi',    'Server.o',
+                   'Thread.hi',    'Thread.o'])],
+     multimod_compile_and_run,
+     ['Server','-debug -O0'])

testsuite/tests/ghc-regress/programs/10queens/test.T

 
-test('10queens', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('10queens',
+     [skip_if_fast,
+      extra_clean(['Main.hi', 'Main.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])

testsuite/tests/ghc-regress/programs/andre_monad/test.T

 # exhausts Hugs's heap (CAF leak)
-test('andre_monad', compose(skip_if_fast,omit_compiler_types(['hugs'])), multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('andre_monad',
+     [skip_if_fast,
+      extra_clean(['Main.hi', 'Main.o']),
+      omit_compiler_types(['hugs'])],
+     multimod_compile_and_run,
+     ['Main', ''])
 

testsuite/tests/ghc-regress/programs/andy_cherry/test.T

 
-test('andy_cherry', compose(skip_if_fast,extra_run_opts('.')), \
-	multimod_compile_and_run, \
-	['Main', '-cpp'])
-clean_o_hi()
+test('andy_cherry',
+     [skip_if_fast,
+      extra_clean(['DataTypes.hi',   'DataTypes.o',
+                   'GenUtils.hi',    'GenUtils.o',
+                   'Interp.hi',      'Interp.o',
+                   'InterpUtils.hi', 'InterpUtils.o',
+                   'Main.hi',        'Main.o',
+                   'Parser.hi',      'Parser.o',
+                   'PrintTEX.hi',    'PrintTEX.o']),
+      extra_run_opts('.')],
+     multimod_compile_and_run,
+     ['Main', '-cpp'])
 

testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T

 # Exhausts Hugs's heap (CAF leak)
 
 test('barton-mangler-bug',
-	composes([skip_if_fast,
-              omit_compiler_types(['hugs']),
-              if_compiler_lt('ghc', '6.9', omit_ways(['profc']))]),
-	multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+     [skip_if_fast,
+      extra_clean(['Basic.hi',             'Basic.o',
+                   'Expected.hi',          'Expected.o',
+                   'Main.hi',              'Main.o',
+                   'Physical.hi',          'Physical.o',
+                   'Plot.hi',              'Plot.o',
+                   'PlotExample.hi',       'PlotExample.o',
+                   'TypesettingTricks.hi', 'TypesettingTricks.o']),
+      omit_compiler_types(['hugs']),
+      if_compiler_lt('ghc', '6.9', omit_ways(['profc']))],
+     multimod_compile_and_run, ['Main', ''])
+

testsuite/tests/ghc-regress/programs/cholewo-eval/test.T

-test('cholewo-eval', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('cholewo-eval',
+     [skip_if_fast,
+      extra_clean(['Main.hi', 'Main.o', 'Arr.hi', 'Arr.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])

testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T

 setTestOpts(only_compiler_types(['ghc']))
 
-test('cvh_unboxing', skip_if_fast, multimod_compile_and_run, \
-	['Main', '-fglasgow-exts'])
-clean_o_hi()
+test('cvh_unboxing',
+     [skip_if_fast,
+      extra_clean(['Append.hi', 'Append.o',
+                   'Main.hi',   'Main.o',
+                   'Types.hi',  'Types.o'])],
+     multimod_compile_and_run,
+     ['Main', '-fglasgow-exts'])
 

testsuite/tests/ghc-regress/programs/fast2haskell/test.T

 
-test('fast2haskell', skip_if_fast, multimod_compile_and_run, \
-	['Main', '-fglasgow-exts'])
-clean_o_hi()
+test('fast2haskell',
+     [skip_if_fast,
+      extra_clean(['Main.hi',         'Main.o',
+                   'Fast2haskell.hi', 'Fast2haskell.o'])],
+     multimod_compile_and_run,
+     ['Main', '-fglasgow-exts'])
 

testsuite/tests/ghc-regress/programs/fun_insts/test.T

 
-test('fun_insts', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('fun_insts',
+     [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])
 

testsuite/tests/ghc-regress/programs/galois_raytrace/test.T

@@ -5,8 +5,22 @@ if config.platform.startswith('i386-') and \
        config.platform != 'i386-unknown-openbsd':
     setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded']))
 
-test('galois_raytrace', \
-	compose(skip_if_fast, reqlib('parsec')), \
-	multimod_compile_and_run, \
-	['Main','-package parsec'])
-clean_o_hi()
+test('galois_raytrace',
+     [skip_if_fast,
+      extra_clean(['CSG.hi',           'CSG.o',
+                   'Construct.hi',     'Construct.o',
+                   'Data.hi',          'Data.o',
+                   'Eval.hi',          'Eval.o',
+                   'Geometry.hi',      'Geometry.o',
+                   'Illumination.hi',  'Illumination.o',
+                   'Intersections.hi', 'Intersections.o',
+                   'Interval.hi',      'Interval.o',
+                   'Main.hi',          'Main.o',
+                   'Misc.hi',          'Misc.o',
+                   'Parse.hi',         'Parse.o',
+                   'Primitives.hi',    'Primitives.o',
+                   'Surface.hi',       'Surface.o']),
+      reqlib('parsec')],
+     multimod_compile_and_run,
+     ['Main','-package parsec'])
+

testsuite/tests/ghc-regress/programs/hs-boot/all.T

 # This test is for bug #906, a problem with the ordering of
 # compilations involving .hs-boot files, fixed in 6.6.
 
-test('hs-boot', normal, multimod_compile, ['Main -v0', ''])
-clean_o_hi()
+test('hs-boot',
+     extra_clean(['A.hi', 'A.hi-boot', 'A.o', 'A.o-boot',
+                  'B.hi', 'B.o', 'C.hi', 'C.o',
+                  'Main.hi', 'Main.o']),
+     multimod_compile,
+     ['Main -v0', ''])

testsuite/tests/ghc-regress/programs/jl_defaults/test.T

 
-test('jl_defaults', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('jl_defaults',
+     [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])
 

testsuite/tests/ghc-regress/programs/joao-circular/test.T

-test('joao-circular', compose(skip_if_fast,extra_run_opts('inp 40')), multimod_compile_and_run, ['Main', '-O'])
-clean_o_hi()
+test('joao-circular',
+     [skip_if_fast,
+      extra_clean(['Data_Lazy.hi',         'Data_Lazy.o',
+                   'Funcs_Lexer.hi',       'Funcs_Lexer.o',
+                   'Funcs_Parser_Lazy.hi', 'Funcs_Parser_Lazy.o',
+                   'LrcPrelude.hi',        'LrcPrelude.o',
+                   'Main.hi',              'Main.o',
+                   'Visfun_Lazy.hi',       'Visfun_Lazy.o']),
+      extra_run_opts('inp 40')],
+     multimod_compile_and_run,
+     ['Main', '-O'])

testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T

 
-test('jq_readsPrec', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('jq_readsPrec',
+     [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])
 

testsuite/tests/ghc-regress/programs/jtod_circint/test.T

 
-test('jtod_circint', skip_if_fast, multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('jtod_circint',
+     [skip_if_fast,
+      extra_clean(['Bit.hi',    'Bit.o',
+                   'LogFun.hi', 'LogFun.o',
+                   'Main.hi',   'Main.o',
+                   'Signal.hi', 'Signal.o'])],
+     multimod_compile_and_run,
+     ['Main', ''])
 

testsuite/tests/ghc-regress/programs/jules_xref/test.T

 # exhausts Hugs's heap
-test('jules_xref', compose(skip_if_fast,omit_compiler_types(['hugs'])), multimod_compile_and_run, ['Main', ''])
-clean_o_hi()
+test('jules_xref',
+     [skip_if_fast,
+      extra_clean(['Main.hi', 'Main.o']),
+      omit_compiler_types(['hugs'])],
+     multimod_compile_and_run,
+     ['Main', ''])