summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2017-01-22 13:24:13 -0500
committerBen Gamari <ben@smart-cactus.org>2017-01-22 14:43:51 -0500
commit5d38fb69fd1e7a434ccc3147ae6a17fe0b5b0be3 (patch)
tree6513044b8f87723c7db716824b33bbf804c02434
parent3f1a21d9725da96dc3cc5d51d97ee4fcc465db47 (diff)
downloadhaskell-5d38fb69fd1e7a434ccc3147ae6a17fe0b5b0be3.tar.gz
Remove clean_cmd and extra_clean usage from .T files
The `clean_cmd` and `extra_clean` setup functions don't do anything. Remove them from .T files. Created using https://github.com/thomie/refactor-ghc-testsuite. This diff is a test for the .T-file parser/processor/pretty-printer in that repository. find . -name '*.T' -exec ~/refactor-ghc-testsuite/Main "{}" \; Tests containing inline comments or multiline strings are not modified. Preparation for #12223. Test Plan: Harbormaster Reviewers: austin, hvr, simonmar, mpickering, bgamari Reviewed By: mpickering Subscribers: mpickering Differential Revision: https://phabricator.haskell.org/D3000 GHC Trac Issues: #12223
-rw-r--r--libraries/base/tests/IO/all.T78
-rw-r--r--libraries/base/tests/all.T15
-rw-r--r--testsuite/tests/annotations/should_compile/all.T6
-rw-r--r--testsuite/tests/annotations/should_compile/th/all.T16
-rw-r--r--testsuite/tests/annotations/should_fail/all.T18
-rw-r--r--testsuite/tests/annotations/should_run/all.T16
-rw-r--r--testsuite/tests/cabal/T12485/all.T5
-rw-r--r--testsuite/tests/cabal/all.T103
-rw-r--r--testsuite/tests/cabal/pkg02/all.T6
-rw-r--r--testsuite/tests/codeGen/should_compile/all.T11
-rw-r--r--testsuite/tests/codeGen/should_run/all.T3
-rw-r--r--testsuite/tests/concurrent/prog001/all.T14
-rw-r--r--testsuite/tests/concurrent/prog002/all.T14
-rw-r--r--testsuite/tests/concurrent/prog003/all.T25
-rw-r--r--testsuite/tests/concurrent/should_run/all.T19
-rw-r--r--testsuite/tests/cpranal/should_compile/all.T5
-rw-r--r--testsuite/tests/deSugar/should_compile/all.T21
-rw-r--r--testsuite/tests/deriving/should_compile/all.T15
-rw-r--r--testsuite/tests/deriving/should_fail/all.T9
-rw-r--r--testsuite/tests/deriving/should_run/all.T2
-rw-r--r--testsuite/tests/determinism/determ002/all.T5
-rw-r--r--testsuite/tests/determinism/determ003/all.T5
-rw-r--r--testsuite/tests/determinism/determ005/all.T5
-rw-r--r--testsuite/tests/determinism/determ006/all.T5
-rw-r--r--testsuite/tests/determinism/determ007/all.T5
-rw-r--r--testsuite/tests/determinism/determ008/all.T5
-rw-r--r--testsuite/tests/determinism/determ009/all.T5
-rw-r--r--testsuite/tests/determinism/determ010/all.T5
-rw-r--r--testsuite/tests/determinism/determ011/all.T5
-rw-r--r--testsuite/tests/determinism/determ012/all.T5
-rw-r--r--testsuite/tests/determinism/determ013/all.T5
-rw-r--r--testsuite/tests/determinism/determ014/all.T5
-rw-r--r--testsuite/tests/determinism/determ015/all.T5
-rw-r--r--testsuite/tests/determinism/determ016/all.T5
-rw-r--r--testsuite/tests/determinism/determ017/all.T5
-rw-r--r--testsuite/tests/determinism/determ018/all.T5
-rw-r--r--testsuite/tests/determinism/determ019/all.T5
-rw-r--r--testsuite/tests/determinism/determ021/all.T5
-rw-r--r--testsuite/tests/dph/classes/dph-classes.T14
-rw-r--r--testsuite/tests/dph/enumfromto/dph-enumfromto.T12
-rw-r--r--testsuite/tests/dph/modules/dph-modules.T12
-rw-r--r--testsuite/tests/driver/T12062/all.T3
-rw-r--r--testsuite/tests/driver/T1372/all.T6
-rw-r--r--testsuite/tests/driver/T1959/test.T6
-rw-r--r--testsuite/tests/driver/T3007/all.T6
-rw-r--r--testsuite/tests/driver/T437/all.T6
-rw-r--r--testsuite/tests/driver/T5147/all.T6
-rw-r--r--testsuite/tests/driver/T7373/all.T8
-rw-r--r--testsuite/tests/driver/T7835/all.T7
-rw-r--r--testsuite/tests/driver/T8526/T8526.T2
-rw-r--r--testsuite/tests/driver/T9562/all.T4
-rw-r--r--testsuite/tests/driver/all.T388
-rw-r--r--testsuite/tests/driver/dynamicToo/all.T6
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo001/test.T11
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo002/test.T8
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo005/test.T6
-rw-r--r--testsuite/tests/driver/dynamic_flags_001/all.T6
-rw-r--r--testsuite/tests/driver/recomp001/all.T6
-rw-r--r--testsuite/tests/driver/recomp002/all.T6
-rw-r--r--testsuite/tests/driver/recomp003/all.T7
-rw-r--r--testsuite/tests/driver/recomp004/all.T6
-rw-r--r--testsuite/tests/driver/recomp005/all.T7
-rw-r--r--testsuite/tests/driver/recomp006/all.T6
-rw-r--r--testsuite/tests/driver/recomp007/all.T5
-rw-r--r--testsuite/tests/driver/recomp008/all.T5
-rw-r--r--testsuite/tests/driver/recomp009/all.T6
-rw-r--r--testsuite/tests/driver/recomp010/all.T6
-rw-r--r--testsuite/tests/driver/recomp011/all.T7
-rw-r--r--testsuite/tests/driver/recomp012/all.T6
-rw-r--r--testsuite/tests/driver/recomp013/all.T6
-rw-r--r--testsuite/tests/driver/recomp016/all.T6
-rw-r--r--testsuite/tests/driver/recomp017/all.T11
-rw-r--r--testsuite/tests/driver/retc002/all.T6
-rw-r--r--testsuite/tests/driver/retc003/all.T7
-rw-r--r--testsuite/tests/dynlibs/all.T29
-rw-r--r--testsuite/tests/ffi/should_compile/all.T3
-rw-r--r--testsuite/tests/ffi/should_fail/all.T5
-rw-r--r--testsuite/tests/ffi/should_run/all.T94
-rw-r--r--testsuite/tests/gadt/all.T20
-rw-r--r--testsuite/tests/generics/GEq/test.T3
-rw-r--r--testsuite/tests/generics/GFunctor/test.T3
-rw-r--r--testsuite/tests/generics/GMap/test.T3
-rw-r--r--testsuite/tests/generics/GShow/test.T3
-rw-r--r--testsuite/tests/generics/Uniplate/test.T4
-rw-r--r--testsuite/tests/generics/all.T8
-rw-r--r--testsuite/tests/ghc-api/T4891/all.T4
-rw-r--r--testsuite/tests/ghc-api/T7478/all.T9
-rw-r--r--testsuite/tests/ghc-api/annotations-literals/all.T6
-rw-r--r--testsuite/tests/ghci.debugger/scripts/all.T3
-rw-r--r--testsuite/tests/ghci.debugger/scripts/break022/all.T2
-rw-r--r--testsuite/tests/ghci.debugger/scripts/break023/all.T2
-rw-r--r--testsuite/tests/ghci/T11827/all.T5
-rw-r--r--testsuite/tests/ghci/linking/all.T41
-rw-r--r--testsuite/tests/ghci/linking/dyn/all.T38
-rw-r--r--testsuite/tests/ghci/prog001/prog001.T7
-rw-r--r--testsuite/tests/ghci/prog002/prog002.T5
-rw-r--r--testsuite/tests/ghci/prog003/prog003.T8
-rw-r--r--testsuite/tests/ghci/prog004/prog004.T4
-rw-r--r--testsuite/tests/ghci/prog005/prog005.T3
-rw-r--r--testsuite/tests/ghci/prog006/prog006.T2
-rw-r--r--testsuite/tests/ghci/prog009/ghci.prog009.T5
-rw-r--r--testsuite/tests/ghci/prog012/all.T3
-rw-r--r--testsuite/tests/ghci/prog014/prog014.T10
-rwxr-xr-xtestsuite/tests/ghci/scripts/all.T56
-rw-r--r--testsuite/tests/haddock/haddock_examples/test.T9
-rw-r--r--testsuite/tests/hsc2hs/all.T58
-rw-r--r--testsuite/tests/indexed-types/should_compile/all.T38
-rw-r--r--testsuite/tests/indexed-types/should_fail/all.T20
-rw-r--r--testsuite/tests/layout/all.T58
-rw-r--r--testsuite/tests/lib/integer/all.T12
-rw-r--r--testsuite/tests/llvm/should_run/subsections_via_symbols/all.T6
-rw-r--r--testsuite/tests/module/all.T178
-rw-r--r--testsuite/tests/module/base01/all.T6
-rw-r--r--testsuite/tests/module/mod175/all.T6
-rw-r--r--testsuite/tests/numeric/should_run/all.T5
-rw-r--r--testsuite/tests/overloadedrecflds/should_compile/all.T2
-rw-r--r--testsuite/tests/overloadedrecflds/should_fail/all.T33
-rw-r--r--testsuite/tests/overloadedrecflds/should_run/all.T15
-rw-r--r--testsuite/tests/parser/prog001/test.T5
-rw-r--r--testsuite/tests/parser/should_compile/T7476/all.T3
-rw-r--r--testsuite/tests/parser/should_compile/all.T6
-rw-r--r--testsuite/tests/parser/unicode/all.T2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/all.T5
-rw-r--r--testsuite/tests/partial-sigs/should_fail/all.T7
-rw-r--r--testsuite/tests/patsyn/should_compile/all.T12
-rw-r--r--testsuite/tests/perf/should_run/all.T16
-rw-r--r--testsuite/tests/plugins/all.T67
-rw-r--r--testsuite/tests/polykinds/all.T5
-rw-r--r--testsuite/tests/profiling/should_run/all.T11
-rw-r--r--testsuite/tests/programs/10queens/test.T6
-rw-r--r--testsuite/tests/programs/Queens/test.T6
-rw-r--r--testsuite/tests/programs/andre_monad/test.T7
-rw-r--r--testsuite/tests/programs/andy_cherry/test.T15
-rw-r--r--testsuite/tests/programs/cholewo-eval/test.T5
-rw-r--r--testsuite/tests/programs/cvh_unboxing/test.T8
-rw-r--r--testsuite/tests/programs/fast2haskell/test.T7
-rw-r--r--testsuite/tests/programs/fun_insts/test.T6
-rw-r--r--testsuite/tests/programs/galois_raytrace/test.T21
-rw-r--r--testsuite/tests/programs/hs-boot/all.T7
-rw-r--r--testsuite/tests/programs/jl_defaults/test.T5
-rw-r--r--testsuite/tests/programs/jq_readsPrec/test.T5
-rw-r--r--testsuite/tests/programs/jtod_circint/test.T9
-rw-r--r--testsuite/tests/programs/jules_xref/test.T8
-rw-r--r--testsuite/tests/programs/jules_xref2/test.T5
-rw-r--r--testsuite/tests/programs/launchbury/test.T6
-rw-r--r--testsuite/tests/programs/lennart_range/test.T5
-rw-r--r--testsuite/tests/programs/lex/test.T6
-rw-r--r--testsuite/tests/programs/life_space_leak/test.T6
-rw-r--r--testsuite/tests/programs/north_array/test.T5
-rw-r--r--testsuite/tests/programs/okeefe_neural/test.T6
-rw-r--r--testsuite/tests/programs/record_upd/test.T6
-rw-r--r--testsuite/tests/programs/rittri/test.T6
-rw-r--r--testsuite/tests/programs/sanders_array/test.T5
-rw-r--r--testsuite/tests/programs/seward-space-leak/test.T5
-rw-r--r--testsuite/tests/programs/strict_anns/test.T5
-rw-r--r--testsuite/tests/programs/thurston-modular-arith/test.T7
-rw-r--r--testsuite/tests/quasiquotation/all.T19
-rw-r--r--testsuite/tests/quasiquotation/qq006/test.T7
-rw-r--r--testsuite/tests/quasiquotation/qq007/test.T10
-rw-r--r--testsuite/tests/quasiquotation/qq008/test.T10
-rw-r--r--testsuite/tests/quasiquotation/qq009/test.T10
-rw-r--r--testsuite/tests/quotes/TH_spliceViewPat/test.T5
-rw-r--r--testsuite/tests/rename/prog001/test.T5
-rw-r--r--testsuite/tests/rename/prog002/test.T5
-rw-r--r--testsuite/tests/rename/prog003/test.T5
-rw-r--r--testsuite/tests/rename/prog004/test.T5
-rw-r--r--testsuite/tests/rename/prog005/test.T8
-rw-r--r--testsuite/tests/rename/prog006/all.T7
-rw-r--r--testsuite/tests/rename/should_compile/T3103/test.T15
-rw-r--r--testsuite/tests/rename/should_compile/all.T160
-rw-r--r--testsuite/tests/rename/should_fail/all.T33
-rw-r--r--testsuite/tests/roles/should_compile/all.T2
-rw-r--r--testsuite/tests/roles/should_fail/all.T7
-rw-r--r--testsuite/tests/rts/T10672/all.T16
-rw-r--r--testsuite/tests/rts/T12031/all.T9
-rw-r--r--testsuite/tests/rts/T12771/all.T9
-rw-r--r--testsuite/tests/rts/T13082/all.T16
-rw-r--r--testsuite/tests/rts/T7289/all.T10
-rw-r--r--testsuite/tests/rts/all.T77
-rw-r--r--testsuite/tests/safeHaskell/check/all.T16
-rw-r--r--testsuite/tests/safeHaskell/check/pkg01/all.T37
-rw-r--r--testsuite/tests/safeHaskell/overlapping/all.T73
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/all.T57
-rw-r--r--testsuite/tests/safeHaskell/safeLanguage/all.T30
-rw-r--r--testsuite/tests/simplCore/T9646/test.T11
-rw-r--r--testsuite/tests/simplCore/prog001/test.T6
-rw-r--r--testsuite/tests/simplCore/prog002/test.T6
-rw-r--r--testsuite/tests/simplCore/prog003/test.T7
-rw-r--r--testsuite/tests/simplCore/should_compile/all.T48
-rw-r--r--testsuite/tests/simplCore/should_run/all.T13
-rw-r--r--testsuite/tests/stranal/should_compile/all.T2
-rw-r--r--testsuite/tests/th/T2014/all.T6
-rw-r--r--testsuite/tests/th/TH_import_loop/TH_import_loop.T7
-rw-r--r--testsuite/tests/th/all.T189
-rw-r--r--testsuite/tests/typecheck/bug1465/all.T5
-rw-r--r--testsuite/tests/typecheck/prog001/test.T6
-rw-r--r--testsuite/tests/typecheck/prog002/test.T6
-rw-r--r--testsuite/tests/typecheck/should_compile/all.T69
-rw-r--r--testsuite/tests/typecheck/should_fail/all.T37
-rwxr-xr-xtestsuite/tests/typecheck/should_run/all.T8
-rw-r--r--testsuite/tests/typecheck/testeq1/test.T8
-rw-r--r--testsuite/tests/unboxedsums/module/all.T6
-rw-r--r--testsuite/tests/warnings/should_compile/T10637/all.T3
-rw-r--r--testsuite/tests/warnings/should_compile/T10890/all.T14
-rw-r--r--testsuite/tests/warnings/should_compile/all.T10
205 files changed, 841 insertions, 2567 deletions
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 44619dce88..5dab48f95d 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -9,17 +9,12 @@ test('IOError001', [omit_ways(['ghci']), set_stdin('IOError001.hs')],
test('IOError002', normal, compile_and_run, [''])
test('finalization001', normal, compile_and_run, [''])
-test('hClose001', extra_clean(['hClose001.tmp']), compile_and_run, [''])
-test('hClose002', extra_clean(['hClose002.tmp']), compile_and_run, [''])
+test('hClose001', [], compile_and_run, [''])
+test('hClose002', [], compile_and_run, [''])
test('hClose003', reqlib('unix'), compile_and_run, ['-package unix'])
test('hFileSize001', normal, compile_and_run, [''])
-test('hFileSize002',
- [omit_ways(['ghci']),
- extra_clean(['hFileSize002.out'])],
- compile_and_run, [''])
-test('hFlush001',
- extra_clean(['hFlush001.out']),
- compile_and_run, [''])
+test('hFileSize002', [omit_ways(['ghci'])], compile_and_run, [''])
+test('hFlush001', [], compile_and_run, [''])
test('hGetBuffering001',
[omit_ways(['ghci']), set_stdin('hGetBuffering001.hs')],
@@ -29,11 +24,9 @@ test('hGetChar001', normal, compile_and_run, [''])
test('hGetLine001', set_stdin('hGetLine001.hs'), compile_and_run, ['-cpp'])
test('hGetLine002', normal, compile_and_run, [''])
test('hGetLine003', normal, compile_and_run, [''])
-test('hGetPosn001',
- extra_clean(['hGetPosn001.out']),
- compile_and_run, ['-cpp'])
+test('hGetPosn001', [], compile_and_run, ['-cpp'])
test('hIsEOF001', normal, compile_and_run, [''])
-test('hIsEOF002', extra_clean(['hIsEOF002.out']), compile_and_run, ['-cpp'])
+test('hIsEOF002', [], compile_and_run, ['-cpp'])
test('hReady001', normal, compile_and_run, ['-cpp'])
@@ -47,7 +40,7 @@ test('hReady002', [cmd_prefix('sleep 1 |'), omit_ways(['ghci'])],
test('hSeek001', normal, compile_and_run, [''])
test('hSeek002', normal, compile_and_run, ['-cpp'])
test('hSeek003', normal, compile_and_run, ['-cpp'])
-test('hSeek004', extra_clean(['hSeek004.out']), compile_and_run, ['-cpp'])
+test('hSeek004', [], compile_and_run, ['-cpp'])
test('hSetBuffering002', set_stdin('hSetBuffering002.hs'), compile_and_run, [''])
@@ -62,37 +55,27 @@ test('ioeGetFileName001', normal, compile_and_run, ['-cpp'])
test('ioeGetHandle001', normal, compile_and_run, ['-cpp'])
test('isEOF001', extra_run_opts('</dev/null'), compile_and_run, [''])
-test('misc001',
- [extra_run_opts('misc001.hs misc001.out'),
- extra_clean(['misc001.out'])],
- compile_and_run, [''])
+test('misc001', [extra_run_opts('misc001.hs misc001.out')], compile_and_run,
+ [''])
test('openFile001', normal, compile_and_run, [''])
test('openFile002', exit_code(1), compile_and_run, [''])
-test('openFile003', extra_clean(['openFile003Dir']), compile_and_run, [''])
-test('openFile004', extra_clean(['openFile004.out']), compile_and_run, [''])
-test('openFile005', extra_clean(['openFile005.out1', 'openFile005.out2']),
- compile_and_run, [''])
-test('openFile006', extra_clean(['openFile006.out']), compile_and_run, [''])
-test('openFile007', extra_clean(['openFile007.out']), compile_and_run, [''])
+test('openFile003', [], compile_and_run, [''])
+test('openFile004', [], compile_and_run, [''])
+test('openFile005', [], compile_and_run, [''])
+test('openFile006', [], compile_and_run, [''])
+test('openFile007', [], compile_and_run, [''])
test('openFile008', cmd_prefix('ulimit -n 2048; '), compile_and_run, [''])
test('putStr001', normal, compile_and_run, [''])
-test('readFile001', extra_clean(['readFile001.out']),
- compile_and_run, [''])
-test('readwrite001',
- extra_clean(['readwrite001.inout']),
- compile_and_run,
- ['-cpp'])
+test('readFile001', [], compile_and_run, [''])
+test('readwrite001', [], compile_and_run, ['-cpp'])
-test('readwrite002',
- [omit_ways(['ghci']),
- set_stdin('readwrite002.hs'),
- extra_clean(['readwrite002.inout'])],
+test('readwrite002', [omit_ways(['ghci']), set_stdin('readwrite002.hs')],
compile_and_run, ['-cpp'])
-test('readwrite003', extra_clean(['readwrite003.txt']), compile_and_run, [''])
+test('readwrite003', [], compile_and_run, [''])
test('hGetBuf001',
[
@@ -100,22 +83,17 @@ test('hGetBuf001',
expect_fail_if_windows],
compile_and_run, ['-package unix'])
-test('hDuplicateTo001', extra_clean(['tmp']), compile_and_run, [''])
+test('hDuplicateTo001', [], compile_and_run, [''])
-test('countReaders001',
- extra_clean(['countReaders001.txt']),
- compile_and_run, [''])
+test('countReaders001', [], compile_and_run, [''])
test('concio001', normal, run_command, ['$MAKE -s --no-print-directory test.concio001'])
test('concio001.thr', normal, run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
test('concio002', reqlib('process'), compile_and_run, [''])
-test('T2122', extra_clean(['T2122-test']), compile_and_run, [''])
-test('T3307',
- [extra_clean(['chinese-file-小说', 'chinese-name'])],
- run_command,
- ['$MAKE -s --no-print-directory T3307-test'])
+test('T2122', [], compile_and_run, [''])
+test('T3307', [], run_command, ['$MAKE -s --no-print-directory T3307-test'])
test('T4855', normal, compile_and_run, [''])
test('hSetEncoding001',extra_run_opts('hSetEncoding001.in'), compile_and_run, [''])
@@ -130,21 +108,17 @@ for e in encoding001Encodings:
for e1 in encoding001Encodings:
for e2 in encoding001Encodings:
encoding001CleanFiles.append('encoding001.' + e1 + '.' + e2)
-test('encoding001',
- extra_clean(encoding001CleanFiles),
- compile_and_run, [''])
+test('encoding001', [], compile_and_run, [''])
test('encoding002', normal, compile_and_run, [''])
test('encoding003', normal, compile_and_run, [''])
test('encoding004', normal, compile_and_run, [''])
test('encoding005', normal, compile_and_run, [''])
-test('environment001',
- [extra_clean(['environment001'])],
- run_command,
+test('environment001', [], run_command,
['$MAKE -s --no-print-directory environment001-test'])
-test('newline001', extra_clean(['newline001.out']), compile_and_run, [''])
+test('newline001', [], compile_and_run, [''])
test('openTempFile001', normal, compile_and_run, [''])
@@ -152,6 +126,6 @@ test('T4144', normal, compile_and_run, [''])
test('encodingerror001', normal, compile_and_run, [''])
-test('T4808', [exit_code(1), extra_clean(['T4808.test'])], compile_and_run, [''])
+test('T4808', [exit_code(1)], compile_and_run, [''])
test('T4895', normal, compile_and_run, [''])
test('T7853', normal, compile_and_run, [''])
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 6899e40ff0..3211054f0a 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -47,7 +47,7 @@ test('trace001', normal, compile_and_run, [''])
test('hGetBuf002', normal, compile_and_run, [''])
test('hGetBuf003', normal, compile_and_run, [''])
test('hPutBuf001', normal, compile_and_run, [''])
-test('hPutBuf002', extra_clean(['hPutBuf002.out']), compile_and_run, [''])
+test('hPutBuf002', [], compile_and_run, [''])
test('char001', normal, compile_and_run, [''])
test('char002', normal, compile_and_run, [''])
@@ -92,16 +92,11 @@ test('list002', when(fast(), skip), compile_and_run, [''])
test('list003', when(fast(), skip), compile_and_run, [''])
test('isSuffixOf', normal, compile_and_run, [''])
-test('memo001',
- [extra_run_opts('+RTS -A10k -RTS'),
- extra_clean(['Memo1.hi', 'Memo1.o'])],
- multimod_compile_and_run,
- ['memo001',''])
+test('memo001', [extra_run_opts('+RTS -A10k -RTS')], multimod_compile_and_run,
+ ['memo001', ''])
-test('memo002',
- [extra_run_opts('20'),
- extra_clean(['Memo2.hi', 'Memo2.o'])],
- multimod_compile_and_run, ['memo002',''])
+test('memo002', [extra_run_opts('20')], multimod_compile_and_run,
+ ['memo002', ''])
test('stableptr001',
[when(fast(), skip), extra_run_opts('+RTS -K8m -RTS')],
diff --git a/testsuite/tests/annotations/should_compile/all.T b/testsuite/tests/annotations/should_compile/all.T
index 74478e919d..b2c9a598c6 100644
--- a/testsuite/tests/annotations/should_compile/all.T
+++ b/testsuite/tests/annotations/should_compile/all.T
@@ -11,9 +11,7 @@ test('', normal, compile_fail, [''])
test('', normal, compile, [''])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile_fail, ['', '-v0'])
+test('', [], multimod_compile_fail, ['', '-v0'])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile, ['', '-v0'])
+test('', [], multimod_compile, ['', '-v0'])
"""
diff --git a/testsuite/tests/annotations/should_compile/th/all.T b/testsuite/tests/annotations/should_compile/th/all.T
index f23009b524..9bcc899263 100644
--- a/testsuite/tests/annotations/should_compile/th/all.T
+++ b/testsuite/tests/annotations/should_compile/th/all.T
@@ -4,17 +4,9 @@
# now, just disable the profiling ways.
test('annth_make',
- [req_interp,
- omit_ways(prof_ways),
- unless(have_dynamic(),skip),
- clean_cmd('$MAKE -s clean_annth_make')],
- run_command,
- ['$MAKE -s --no-print-directory annth_make'])
+ [req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)],
+ run_command, ['$MAKE -s --no-print-directory annth_make'])
test('annth_compunits',
- [req_interp,
- omit_ways(prof_ways),
- unless(have_dynamic(),skip),
- clean_cmd('$MAKE -s clean_annth_compunits')],
- run_command,
- ['$MAKE -s --no-print-directory annth_compunits'])
+ [req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)],
+ run_command, ['$MAKE -s --no-print-directory annth_compunits'])
diff --git a/testsuite/tests/annotations/should_fail/all.T b/testsuite/tests/annotations/should_fail/all.T
index 0b10d8394a..872ab41d88 100644
--- a/testsuite/tests/annotations/should_fail/all.T
+++ b/testsuite/tests/annotations/should_fail/all.T
@@ -2,15 +2,9 @@
test('annfail01', normal, compile_fail, [''])
test('annfail02', normal, compile_fail, [''])
test('annfail03', req_interp, compile_fail, [''])
-test('annfail04',
- [req_interp, extra_clean(['Annfail04_Help.hi', 'Annfail04_Help.o'])],
- multimod_compile_fail, ['annfail04', '-v0'])
-test('annfail05',
- [req_interp, extra_clean(['Annfail05_Help.hi', 'Annfail05_Help.o'])],
- multimod_compile_fail, ['annfail05', '-v0'])
-test('annfail06',
- [req_interp, extra_clean(['Annfail06_Help.hi', 'Annfail06_Help.o'])],
- multimod_compile_fail, ['annfail06', '-v0'])
+test('annfail04', [req_interp], multimod_compile_fail, ['annfail04', '-v0'])
+test('annfail05', [req_interp], multimod_compile_fail, ['annfail05', '-v0'])
+test('annfail06', [req_interp], multimod_compile_fail, ['annfail06', '-v0'])
test('annfail07', req_interp, compile_fail, [''])
test('annfail08', req_interp, compile_fail, [''])
test('annfail09', req_interp, compile_fail, [''])
@@ -26,9 +20,7 @@ test('', normal, compile_fail, [''])
test('', normal, compile, [''])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile_fail, ['', '-v0'])
+test('', [], multimod_compile_fail, ['', '-v0'])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile, ['', '-v0'])
+test('', [], multimod_compile, ['', '-v0'])
"""
diff --git a/testsuite/tests/annotations/should_run/all.T b/testsuite/tests/annotations/should_run/all.T
index fabd08ce0e..cba34c5559 100644
--- a/testsuite/tests/annotations/should_run/all.T
+++ b/testsuite/tests/annotations/should_run/all.T
@@ -7,14 +7,10 @@ setTestOpts(when(fast(), skip))
# now, just disable the profiling and dynamic ways, and use
# config.ghc_th_way_flags.
test('annrun01',
- [extra_clean(['Annrun01_Help.hi', 'Annrun01_Help.o',
- 'annrun01.hi', 'annrun01.o',
- 'Config.hs', 'Config.hi', 'Config.o']),
- pre_cmd('$MAKE -s --no-print-directory config'),
+ [pre_cmd('$MAKE -s --no-print-directory config'),
omit_ways(['dyn'] + prof_ways)],
- multimod_compile_and_run,
- ['annrun01', '-package ghc ' + config.ghc_th_way_flags]
- )
+ multimod_compile_and_run,
+ ['annrun01', '-package ghc ' + config.ghc_th_way_flags])
""""
Helpful things to C+P:
@@ -23,9 +19,7 @@ test('', normal, compile_fail, [''])
test('', normal, compile, [''])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile_fail, ['', '-v0'])
+test('', [], multimod_compile_fail, ['', '-v0'])
-test('', extra_clean(['.hi', '.o']),
- multimod_compile, ['', '-v0'])
+test('', [], multimod_compile, ['', '-v0'])
"""
diff --git a/testsuite/tests/cabal/T12485/all.T b/testsuite/tests/cabal/T12485/all.T
index be817eb274..f6998973ea 100644
--- a/testsuite/tests/cabal/T12485/all.T
+++ b/testsuite/tests/cabal/T12485/all.T
@@ -1,4 +1 @@
-test('T12485',
- [extra_clean(['a.db', 'b.db', 'Main.o', 'Main', 'Main.hi'])],
- run_command,
- ['$MAKE -s --no-print-directory T12485'])
+test('T12485', [], run_command, ['$MAKE -s --no-print-directory T12485'])
diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T
index 64f26396c4..fc7269c4f3 100644
--- a/testsuite/tests/cabal/all.T
+++ b/testsuite/tests/cabal/all.T
@@ -1,25 +1,14 @@
def normaliseDynlibNames(str):
return re.sub('-ghc[0-9.]+\.', '-ghc<VERSION>.', str)
-test('ghcpkg01',
- extra_clean(['local01.package.conf',
- 'local01.package.conf.old']),
- run_command,
- ['$MAKE -s --no-print-directory ghcpkg01'])
+test('ghcpkg01', [], run_command, ['$MAKE -s --no-print-directory ghcpkg01'])
# Use ignore_stderr to prevent (when HADDOCK_DOCS=NO):
# warning: haddock-interfaces .. doesn't exist or isn't a file
-test('ghcpkg02',
- [ignore_stderr,
- extra_clean(['package.conf.ghcpkg02', 'package.conf.ghcpkg02.old'])],
- run_command,
+test('ghcpkg02', [ignore_stderr], run_command,
['$MAKE -s --no-print-directory ghcpkg02'])
-test('ghcpkg03',
- [extra_clean(['local03.package.conf',
- 'local03.package.conf.old']),
- normalise_errmsg_fun(normaliseDynlibNames)],
- run_command,
+test('ghcpkg03', [normalise_errmsg_fun(normaliseDynlibNames)], run_command,
['$MAKE -s --no-print-directory ghcpkg03'])
def normalise_package_order(s):
@@ -28,12 +17,7 @@ def normalise_package_order(s):
'newtestpkg-2.0 testpkg-1.2.3.4',
s)
-test('ghcpkg04',
- [
- normalise_errmsg_fun(normalise_package_order),
- extra_clean(['local04.package.conf',
- 'local04.package.conf.old'])],
- run_command,
+test('ghcpkg04', [normalise_errmsg_fun(normalise_package_order)], run_command,
['$MAKE -s --no-print-directory ghcpkg04'])
# Sometimes we get spurious warnings from ghc-pkg about missing
@@ -42,69 +26,26 @@ def normalise_haddock_junk( str ):
return re.sub(r'Warning: haddock.*\n', '', str)
test('ghcpkg05',
- [ extra_clean(['local05a.package.conf',
- 'local05a.package.conf.old',
- 'local05b.package.conf',
- 'local05b.package.conf.old']),
- normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames)
- ],
- run_command,
- ['$MAKE -s --no-print-directory ghcpkg05'])
-test('ghcpkg06',
- [extra_clean(['local06.package.conf',
- 'local06.package.conf.old'])],
- run_command,
- ['$MAKE -s --no-print-directory ghcpkg06'])
-
-test('ghcpkg07',
- extra_clean(['local07.package.conf',
- 'local07.package.conf.old']),
- run_command,
- ['$MAKE -s --no-print-directory ghcpkg07'])
+ [normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames)],
+ run_command, ['$MAKE -s --no-print-directory ghcpkg05'])
+test('ghcpkg06', [], run_command, ['$MAKE -s --no-print-directory ghcpkg06'])
+
+test('ghcpkg07', [], run_command, ['$MAKE -s --no-print-directory ghcpkg07'])
# Test that we *can* compile a module that also belongs to a package
# (this was disallowed in GHC 6.4 and earlier)
test('pkg01', normal, compile, [''])
-test('T1750',
- extra_clean(['T1750.hs', 'T1750.out',
- 'localT1750.package.conf',
- 'localT1750.package.conf.old']),
- run_command, ['$MAKE -s --no-print-directory T1750'])
-
-test('T5442a',
- [extra_clean(['package.conf.T5442a.global', 'package.conf.T5442a.user'])],
- run_command,
- ['$MAKE -s --no-print-directory T5442a'])
-
-test('T5442b',
- [extra_clean(['package.conf.T5442b.global', 'package.conf.T5442b.user'])],
- run_command,
- ['$MAKE -s --no-print-directory T5442b'])
-
-test('T5442c',
- [extra_clean(['package.conf.T5442c.global', 'package.conf.T5442c.user',
- 'package.conf.T5442c.extra'])],
- run_command,
- ['$MAKE -s --no-print-directory T5442c'])
-
-test('T5442d',
- [extra_clean(['package.conf.T5442d.global', 'package.conf.T5442d.user',
- 'package.conf.T5442d.extra'])],
- run_command,
- ['$MAKE -s --no-print-directory T5442d'])
-
-test('shadow',
- extra_clean(['shadow.out', 'shadow.hs', 'shadow.hi',
- 'local1shadow1.package.conf',
- 'local1shadow1.package.conf.old',
- 'local1shadow2.package.conf',
- 'local1shadow2.package.conf.old']),
- run_command, ['$MAKE -s --no-print-directory shadow'])
-
-test('T12485a',
- extra_clean(['T12485a.hi', 'T1750.out',
- 'T12485a.package.conf',
- 'T12485b.package.conf',
- 'T12485c.package.conf']),
- run_command, ['$MAKE -s --no-print-directory T12485a'])
+test('T1750', [], run_command, ['$MAKE -s --no-print-directory T1750'])
+
+test('T5442a', [], run_command, ['$MAKE -s --no-print-directory T5442a'])
+
+test('T5442b', [], run_command, ['$MAKE -s --no-print-directory T5442b'])
+
+test('T5442c', [], run_command, ['$MAKE -s --no-print-directory T5442c'])
+
+test('T5442d', [], run_command, ['$MAKE -s --no-print-directory T5442d'])
+
+test('shadow', [], run_command, ['$MAKE -s --no-print-directory shadow'])
+
+test('T12485a', [], run_command, ['$MAKE -s --no-print-directory T12485a'])
diff --git a/testsuite/tests/cabal/pkg02/all.T b/testsuite/tests/cabal/pkg02/all.T
index b3dfecc0b5..651e9f903b 100644
--- a/testsuite/tests/cabal/pkg02/all.T
+++ b/testsuite/tests/cabal/pkg02/all.T
@@ -3,8 +3,4 @@
# separate packages are allowed). Now it is a straightforward test
# for shadowing: the local Foreign module shadows the base package
# one.
-test('pkg02',
- [extra_clean(['A.o', 'A.hi', 'Foreign.o', 'Foreign.hi'])],
- multimod_compile,
- ['A','-v0'])
-
+test('pkg02', [], multimod_compile, ['A', '-v0'])
diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index e3fad1895d..6ae4e1cb4e 100644
--- a/testsuite/tests/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
@@ -10,8 +10,7 @@ test('cg008', normal, compile, [''])
test('T1916', normal, compile, [''])
test('T2388', normal, compile, [''])
test('T3132', normal, compile, ['-dcmm-lint'])
-test('T3286', extra_clean(['T3286b.o','T3286b.hi']),
- multimod_compile, ['T3286', '-v0'])
+test('T3286', [], multimod_compile, ['T3286', '-v0'])
test('T3579', normal, compile, [''])
test('T2578', normal, run_command, ['$MAKE -s --no-print-directory T2578'])
# skip llvm on i386 as we don't support fPIC
@@ -26,11 +25,9 @@ test('T9155', normal, compile, ['-O2'])
test('T9303', normal, compile, ['-O2'])
test('T9329', [cmm_src], compile, [''])
-test('debug', [ extra_clean(['debug.cmm']),
- when((arch('powerpc64') or arch('powerpc64le')),
- expect_broken(11261))],
- run_command,
- ['$MAKE -s --no-print-directory debug'])
+test('debug',
+ [when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261))],
+ run_command, ['$MAKE -s --no-print-directory debug'])
test('T9964', normal, compile, ['-O'])
test('T10518', [cmm_src], compile, [''])
test('T10667', [ when((arch('powerpc64') or arch('powerpc64le')),
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 5059cb4483..1895be7fd1 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -70,8 +70,7 @@ test('cgrun063', normal, compile_and_run, [''])
test('cgrun064', normal, compile_and_run, [''])
test('cgrun065', normal, compile_and_run, [''])
test('cgrun066', normal, compile_and_run, [''])
-test('cgrun067', extra_clean(['Cgrun067A.hi', 'Cgrun067A.o']),
- compile_and_run, [''])
+test('cgrun067', [], compile_and_run, [''])
test('cgrun068', reqlib('random'), compile_and_run, [''])
test('cgrun069', omit_ways(['ghci']), multi_compile_and_run,
['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index b5d4b1c4eb..f23cc8804a 100644
--- a/testsuite/tests/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
@@ -12,15 +12,5 @@
# multiple cores, which is why it is only running the 'threaded2' way
# right now. --SDM 1/4/2010
-test('concprog001',
- [when(fast(), skip),
- only_ways(['threaded2']),
- 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',''])
+test('concprog001', [when(fast(), skip), only_ways(['threaded2'])],
+ multimod_compile_and_run, ['Mult', ''])
diff --git a/testsuite/tests/concurrent/prog002/all.T b/testsuite/tests/concurrent/prog002/all.T
index 54613a7e4a..dc583b3bd2 100644
--- a/testsuite/tests/concurrent/prog002/all.T
+++ b/testsuite/tests/concurrent/prog002/all.T
@@ -10,14 +10,6 @@ else:
# hence -O0:
test('concprog002',
- [only_ways(['threaded2','threaded2_hT']),
- extra_ways(ways),
- exit_code(1),
- when(fast(), skip),
- reqlib('random'),
- extra_clean(['Event.hi', 'Event.o',
- 'Scheduler.hi', 'Scheduler.o',
- 'Server.hi', 'Server.o',
- 'Thread.hi', 'Thread.o'])],
- multimod_compile_and_run,
- ['Server','-O0'])
+ [only_ways(['threaded2', 'threaded2_hT']), extra_ways(ways), exit_code(1),
+ when(fast(), skip), reqlib('random')],
+ multimod_compile_and_run, ['Server', '-O0'])
diff --git a/testsuite/tests/concurrent/prog003/all.T b/testsuite/tests/concurrent/prog003/all.T
index 7522b10010..2f7fe3bec8 100644
--- a/testsuite/tests/concurrent/prog003/all.T
+++ b/testsuite/tests/concurrent/prog003/all.T
@@ -10,25 +10,6 @@
# occasionally, but at least the test is here for posterity.
test('concprog003',
- [when(fast(), skip),
- extra_clean([
- 'BackList2.hi', 'BackList2.o',
- 'ImmList.hi', 'ImmList.o',
- 'MainMVarList.hi', 'MainMVarList.o',
- 'TestDataParser.hi', 'TestDataParser.o',
- 'CASList.hi', 'CASList.o',
- 'IOList.hi', 'IOList.o',
- 'MVarListLockCoupling.hi', 'MVarListLockCoupling.o',
- 'TestRun.hi', 'TestRun.o',
- 'Collate.hi', 'Collate.o',
- 'LazyList2.hi', 'LazyList2.o',
- 'RefInterface.hi', 'RefInterface.o',
- 'Collection.hi', 'Collection.o',
- 'Main.hi', 'Main.o',
- 'TestData.hi', 'TestData.o'
- ]),
- reqlib('random'),
- extra_run_opts('IMM -t test-8-3000-3000-2-1-4'),
- ],
- multimod_compile_and_run,
- ['Main',''])
+ [when(fast(), skip), reqlib('random'),
+ extra_run_opts('IMM -t test-8-3000-3000-2-1-4')],
+ multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 24ea29d2b7..87af525e9f 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -227,12 +227,9 @@ test('conc045', normal, compile_and_run, [''])
test('conc058', normal, compile_and_run, [''])
test('conc059',
- [
- only_ways(['threaded1','threaded2']),
- pre_cmd('$MAKE -s --no-print-directory conc059_setup'),
- extra_clean(['conc059_c.o'])],
- compile_and_run,
- ['conc059_c.c -no-hs-main'])
+ [only_ways(['threaded1', 'threaded2']),
+ pre_cmd('$MAKE -s --no-print-directory conc059_setup')],
+ compile_and_run, ['conc059_c.c -no-hs-main'])
# This test sometimes just exits successfully
# when run the threaded2 way. The problem hasn't been diagnosed yet
@@ -268,13 +265,9 @@ test('hs_try_putmvar001',
# A benchmark for hs_try_putmvar() vs. foreign export
# This one should work for both threaded and non-threaded RTS
test('hs_try_putmvar002',
- [
- pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar002_setup'),
- extra_clean(['hs_try_putmvar002_c.o']),
- extra_run_opts('1 8 10000')
- ],
- compile_and_run,
- ['hs_try_putmvar002_c.c'])
+ [pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar002_setup'),
+ extra_run_opts('1 8 10000')],
+ compile_and_run, ['hs_try_putmvar002_c.c'])
# Another benchmark for hs_try_putmvar() vs. foreign export
test('hs_try_putmvar003',
diff --git a/testsuite/tests/cpranal/should_compile/all.T b/testsuite/tests/cpranal/should_compile/all.T
index 2ec0a84e9a..5a37f42376 100644
--- a/testsuite/tests/cpranal/should_compile/all.T
+++ b/testsuite/tests/cpranal/should_compile/all.T
@@ -4,7 +4,4 @@ def f( name, opts ):
setTestOpts(f)
-test('Cpr001',
- extra_clean(['Cpr001_imp.hi', 'Cpr001_imp.o', 'Cpr001_imp.comp.stderr']),
- multimod_compile,
- ['Cpr001', '-v0'])
+test('Cpr001', [], multimod_compile, ['Cpr001', '-v0'])
diff --git a/testsuite/tests/deSugar/should_compile/all.T b/testsuite/tests/deSugar/should_compile/all.T
index aa8dd87d50..d40f8eb05c 100644
--- a/testsuite/tests/deSugar/should_compile/all.T
+++ b/testsuite/tests/deSugar/should_compile/all.T
@@ -75,27 +75,14 @@ test('T2395', normal, compile, [''])
test('T4371', normal, compile, [''])
test('T4439', normal, compile, [''])
test('T4488', normal, compile, [''])
-test('T4870',
- [only_ways(['optasm']),
- extra_clean(['T4870a.hi', 'T4870a.o'])],
- multimod_compile,
- ['T4870', '-v0'])
+test('T4870', [only_ways(['optasm'])], multimod_compile, ['T4870', '-v0'])
test('T5117', normal, compile, [''])
-test('T5252',
- extra_clean(['T5252a.hi', 'T5252a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T5252'])
+test('T5252', [], run_command, ['$MAKE -s --no-print-directory T5252'])
test('T5455', normal, compile, [''])
-test('T5001',
- [only_ways(['optasm']),
- extra_clean(['T5001a.hi', 'T5001a.o'])],
- multimod_compile,
- ['T5001', '-v0'])
+test('T5001', [only_ways(['optasm'])], multimod_compile, ['T5001', '-v0'])
# T5252Take2 failed when compiled *wihtout* optimisation
-test('T5252Take2',
- extra_clean(['T5252Take2a.hi', 'T5252Take2a.o']),
- run_command,
+test('T5252Take2', [], run_command,
['$MAKE -s --no-print-directory T5252Take2'])
test('T2431', normal, compile, ['-ddump-simpl -dsuppress-uniques'])
test('T7669', normal, compile, [''])
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index fd4bb54e82..31f8669230 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -20,7 +20,7 @@ test('T1830_2', normal, compile, [''])
test('T2378', normal, compile, [''])
test('T2721', normal, compile, [''])
test('T2856', normal, compile, [''])
-test('T3057', extra_clean(['T3057A.o', 'T3057A.hi']), multimod_compile, ['T3057', '-v0'])
+test('T3057', [], multimod_compile, ['T3057', '-v0'])
test('T3012', normal, compile, [''])
test('T3965', normal, compile, [''])
test('T4220', normal, compile, [''])
@@ -33,12 +33,9 @@ test('T5939', normal, compile, [''])
test('drv-functor1', normal, compile, [''])
test('drv-functor2', normal, compile, [''])
test('drv-foldable-traversable1', normal, compile, [''])
-test('T6031', extra_clean(['T6031a.o', 'T6031a.hi']), multimod_compile, ['T6031', '-v0 -O'])
+test('T6031', [], multimod_compile, ['T6031', '-v0 -O'])
# Adding -O on T6031 to expose Trac #11245 regardless of way
-test('T1133',
- extra_clean(['T1133.o-boot', 'T1133.hi-boot', 'T1133a.o', 'T1133a.hi']),
- run_command,
- ['$MAKE --no-print-directory -s T1133'])
+test('T1133', [], run_command, ['$MAKE --no-print-directory -s T1133'])
test('T7704', normal, compile, [''])
test('T7710', normal, compile, [''])
@@ -47,7 +44,7 @@ test('AutoDeriveTypeable', normal, compile, [''])
test('T8138', reqlib('primitive'), compile, ['-O2'])
test('T8165', normal, compile, [''])
test('T8631', normal, compile, [''])
-test('T8758', extra_clean(['T8758a.o', 'T8758a.hi']), multimod_compile, ['T8758a', '-v0'])
+test('T8758', [], multimod_compile, ['T8758a', '-v0'])
test('T8678', normal, compile, [''])
test('T8865', normal, compile, [''])
test('T8893', normal, compile, [''])
@@ -57,9 +54,9 @@ test('T7269', normal, compile, [''])
test('T9069', normal, compile, [''])
test('T9359', normal, compile, [''])
test('T4896', normal, compile, [''])
-test('T7947', extra_clean(['T7947a.o', 'T7947a.hi', 'T7947b.o', 'T7947b.hi']), multimod_compile, ['T7947', '-v0'])
+test('T7947', [], multimod_compile, ['T7947', '-v0'])
test('T10561', normal, compile, [''])
-test('T10487', extra_clean(['T10487_M.o', 'T10487_M.hi']), multimod_compile, ['T10487', '-v0'])
+test('T10487', [], multimod_compile, ['T10487', '-v0'])
test('T10524', normal, compile, [''])
test('T11148', normal, run_command,
['$MAKE -s --no-print-directory T11148'])
diff --git a/testsuite/tests/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T
index 2e686b883a..b15cda455d 100644
--- a/testsuite/tests/deriving/should_fail/all.T
+++ b/testsuite/tests/deriving/should_fail/all.T
@@ -12,9 +12,7 @@ test('drvfail011', normal, compile_fail, [''])
test('drvfail012', normal, compile_fail, [''])
test('drvfail013', normal, compile_fail, [''])
test('drvfail015', normal, compile_fail, [''])
-test('drvfail016',
- extra_clean(['drvfail016.hi-boot', 'drvfail016.o-boot']),
- run_command,
+test('drvfail016', [], run_command,
['$MAKE --no-print-directory -s drvfail016'])
test('T1830_1', normal, compile_fail, [''])
test('T2394', normal, compile_fail, [''])
@@ -35,10 +33,7 @@ test('T5287', normal, compile_fail, [''])
test('T5478', normal, compile_fail, [''])
test('T5686', normal, compile_fail, [''])
test('T5922', normal, compile_fail, [''])
-test('T1133A',
- extra_clean(['T1133A.o-boot', 'T1133A.hi-boot', 'T1133Aa.o', 'T1133Aa.hi']),
- run_command,
- ['$MAKE --no-print-directory -s T1133A'])
+test('T1133A', [], run_command, ['$MAKE --no-print-directory -s T1133A'])
# 5863a was removed as it was out of date re: fixing #9858
test('T7959', normal, compile_fail, [''])
diff --git a/testsuite/tests/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T
index ede2f90140..3bcebdf371 100644
--- a/testsuite/tests/deriving/should_run/all.T
+++ b/testsuite/tests/deriving/should_run/all.T
@@ -37,7 +37,7 @@ test('T5712', normal, compile_and_run, [''])
test('T7931', normal, compile_and_run, [''])
# T8280 is superseded by T10104
test('T9576', exit_code(1), compile_and_run, [''])
-test('T9830', extra_clean(['T9830a.hi', 'T9830a.o']), multimod_compile_and_run, ['T9830','-v0'])
+test('T9830', [], multimod_compile_and_run, ['T9830', '-v0'])
test('T10104', normal, compile_and_run, [''])
test('T10447', normal, compile_and_run, [''])
test('T10598_bug', normal, compile_and_run, [''])
diff --git a/testsuite/tests/determinism/determ002/all.T b/testsuite/tests/determinism/determ002/all.T
index 9bfd05db00..e3367f1380 100644
--- a/testsuite/tests/determinism/determ002/all.T
+++ b/testsuite/tests/determinism/determ002/all.T
@@ -1,4 +1 @@
-test('determ002',
- extra_clean(['A.o', 'A.hi', 'A.old.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ002'])
+test('determ002', [], run_command, ['$MAKE -s --no-print-directory determ002'])
diff --git a/testsuite/tests/determinism/determ003/all.T b/testsuite/tests/determinism/determ003/all.T
index c00544d51a..737ce312b5 100644
--- a/testsuite/tests/determinism/determ003/all.T
+++ b/testsuite/tests/determinism/determ003/all.T
@@ -1,4 +1 @@
-test('determ003',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ003'])
+test('determ003', [], run_command, ['$MAKE -s --no-print-directory determ003'])
diff --git a/testsuite/tests/determinism/determ005/all.T b/testsuite/tests/determinism/determ005/all.T
index 5696cefdfa..73b5628e94 100644
--- a/testsuite/tests/determinism/determ005/all.T
+++ b/testsuite/tests/determinism/determ005/all.T
@@ -1,4 +1 @@
-test('determ005',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ005'])
+test('determ005', [], run_command, ['$MAKE -s --no-print-directory determ005'])
diff --git a/testsuite/tests/determinism/determ006/all.T b/testsuite/tests/determinism/determ006/all.T
index e0d5238bf8..65b5743c3e 100644
--- a/testsuite/tests/determinism/determ006/all.T
+++ b/testsuite/tests/determinism/determ006/all.T
@@ -1,4 +1 @@
-test('determ006',
- extra_clean(['spec-inline-determ.o', 'spec-inline-determ.hi', 'spec-inline-determ.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ006'])
+test('determ006', [], run_command, ['$MAKE -s --no-print-directory determ006'])
diff --git a/testsuite/tests/determinism/determ007/all.T b/testsuite/tests/determinism/determ007/all.T
index 6d818588ba..21e071a2f7 100644
--- a/testsuite/tests/determinism/determ007/all.T
+++ b/testsuite/tests/determinism/determ007/all.T
@@ -1,4 +1 @@
-test('determ007',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ007'])
+test('determ007', [], run_command, ['$MAKE -s --no-print-directory determ007'])
diff --git a/testsuite/tests/determinism/determ008/all.T b/testsuite/tests/determinism/determ008/all.T
index af4d8d7948..56aef14485 100644
--- a/testsuite/tests/determinism/determ008/all.T
+++ b/testsuite/tests/determinism/determ008/all.T
@@ -1,4 +1 @@
-test('determ008',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ008'])
+test('determ008', [], run_command, ['$MAKE -s --no-print-directory determ008'])
diff --git a/testsuite/tests/determinism/determ009/all.T b/testsuite/tests/determinism/determ009/all.T
index 7cae393162..36fd355b1a 100644
--- a/testsuite/tests/determinism/determ009/all.T
+++ b/testsuite/tests/determinism/determ009/all.T
@@ -1,4 +1 @@
-test('determ009',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ009'])
+test('determ009', [], run_command, ['$MAKE -s --no-print-directory determ009'])
diff --git a/testsuite/tests/determinism/determ010/all.T b/testsuite/tests/determinism/determ010/all.T
index 030868f7a1..6c21bd9baf 100644
--- a/testsuite/tests/determinism/determ010/all.T
+++ b/testsuite/tests/determinism/determ010/all.T
@@ -1,4 +1 @@
-test('determ010',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ010'])
+test('determ010', [], run_command, ['$MAKE -s --no-print-directory determ010'])
diff --git a/testsuite/tests/determinism/determ011/all.T b/testsuite/tests/determinism/determ011/all.T
index ba9ef62a18..8dddd786b3 100644
--- a/testsuite/tests/determinism/determ011/all.T
+++ b/testsuite/tests/determinism/determ011/all.T
@@ -1,4 +1 @@
-test('determ011',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ011'])
+test('determ011', [], run_command, ['$MAKE -s --no-print-directory determ011'])
diff --git a/testsuite/tests/determinism/determ012/all.T b/testsuite/tests/determinism/determ012/all.T
index f493d4241b..9344d17322 100644
--- a/testsuite/tests/determinism/determ012/all.T
+++ b/testsuite/tests/determinism/determ012/all.T
@@ -1,4 +1 @@
-test('determ012',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ012'])
+test('determ012', [], run_command, ['$MAKE -s --no-print-directory determ012'])
diff --git a/testsuite/tests/determinism/determ013/all.T b/testsuite/tests/determinism/determ013/all.T
index 0804f039a6..5cea086c68 100644
--- a/testsuite/tests/determinism/determ013/all.T
+++ b/testsuite/tests/determinism/determ013/all.T
@@ -1,4 +1 @@
-test('determ013',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ013'])
+test('determ013', [], run_command, ['$MAKE -s --no-print-directory determ013'])
diff --git a/testsuite/tests/determinism/determ014/all.T b/testsuite/tests/determinism/determ014/all.T
index 4d376f2d99..519a12570b 100644
--- a/testsuite/tests/determinism/determ014/all.T
+++ b/testsuite/tests/determinism/determ014/all.T
@@ -1,4 +1 @@
-test('determ014',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ014'])
+test('determ014', [], run_command, ['$MAKE -s --no-print-directory determ014'])
diff --git a/testsuite/tests/determinism/determ015/all.T b/testsuite/tests/determinism/determ015/all.T
index e4d65f43b3..3b0e5e1341 100644
--- a/testsuite/tests/determinism/determ015/all.T
+++ b/testsuite/tests/determinism/determ015/all.T
@@ -1,4 +1 @@
-test('determ015',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ015'])
+test('determ015', [], run_command, ['$MAKE -s --no-print-directory determ015'])
diff --git a/testsuite/tests/determinism/determ016/all.T b/testsuite/tests/determinism/determ016/all.T
index 40fa202002..dd7be7c6d8 100644
--- a/testsuite/tests/determinism/determ016/all.T
+++ b/testsuite/tests/determinism/determ016/all.T
@@ -1,4 +1 @@
-test('determ016',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ016'])
+test('determ016', [], run_command, ['$MAKE -s --no-print-directory determ016'])
diff --git a/testsuite/tests/determinism/determ017/all.T b/testsuite/tests/determinism/determ017/all.T
index 8bff33b1fd..0d0bb28c06 100644
--- a/testsuite/tests/determinism/determ017/all.T
+++ b/testsuite/tests/determinism/determ017/all.T
@@ -1,4 +1 @@
-test('determ017',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ017'])
+test('determ017', [], run_command, ['$MAKE -s --no-print-directory determ017'])
diff --git a/testsuite/tests/determinism/determ018/all.T b/testsuite/tests/determinism/determ018/all.T
index 96c35feb3a..9e7c9b8a04 100644
--- a/testsuite/tests/determinism/determ018/all.T
+++ b/testsuite/tests/determinism/determ018/all.T
@@ -1,4 +1 @@
-test('determ018',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ018'])
+test('determ018', [], run_command, ['$MAKE -s --no-print-directory determ018'])
diff --git a/testsuite/tests/determinism/determ019/all.T b/testsuite/tests/determinism/determ019/all.T
index caa03add26..112431d103 100644
--- a/testsuite/tests/determinism/determ019/all.T
+++ b/testsuite/tests/determinism/determ019/all.T
@@ -1,4 +1 @@
-test('determ019',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ019'])
+test('determ019', [], run_command, ['$MAKE -s --no-print-directory determ019'])
diff --git a/testsuite/tests/determinism/determ021/all.T b/testsuite/tests/determinism/determ021/all.T
index 35af3622b7..ed642f691f 100644
--- a/testsuite/tests/determinism/determ021/all.T
+++ b/testsuite/tests/determinism/determ021/all.T
@@ -1,4 +1 @@
-test('determ021',
- extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
- run_command,
- ['$MAKE -s --no-print-directory determ021'])
+test('determ021', [], run_command, ['$MAKE -s --no-print-directory determ021'])
diff --git a/testsuite/tests/dph/classes/dph-classes.T b/testsuite/tests/dph/classes/dph-classes.T
index f2acc88af5..acd19ba4b1 100644
--- a/testsuite/tests/dph/classes/dph-classes.T
+++ b/testsuite/tests/dph/classes/dph-classes.T
@@ -1,10 +1,6 @@
-test ('dph-classes-vseg-fast'
- , [ normal
- , extra_clean(['Main.o', 'Main.hi', 'DefsVect.hi', 'DefsVect.o'])
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-O0 -fno-enable-rewrite-rules -package dph-lifted-vseg'])
+test('dph-classes-vseg-fast',
+ [normal, reqlib('dph-lifted-vseg'), reqlib('dph-prim-par'),
+ only_ways(['normal', 'threaded1', 'threaded2'])],
+ multimod_compile_and_run,
+ ['Main', '-O0 -fno-enable-rewrite-rules -package dph-lifted-vseg'])
diff --git a/testsuite/tests/dph/enumfromto/dph-enumfromto.T b/testsuite/tests/dph/enumfromto/dph-enumfromto.T
index 5f597a6623..ac4d0f0176 100644
--- a/testsuite/tests/dph/enumfromto/dph-enumfromto.T
+++ b/testsuite/tests/dph/enumfromto/dph-enumfromto.T
@@ -1,8 +1,4 @@
-test ('EnumFromToP'
- , [ extra_clean(['EnumFromToP.o', 'EnumFromToP.hi'])
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , expect_broken(7736)
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , compile
- , [ '-O0 -package dph-lifted-vseg'])
+test('EnumFromToP',
+ [reqlib('dph-lifted-vseg'), reqlib('dph-prim-par'), expect_broken(7736),
+ only_ways(['normal', 'threaded1', 'threaded2'])],
+ compile, ['-O0 -package dph-lifted-vseg'])
diff --git a/testsuite/tests/dph/modules/dph-modules.T b/testsuite/tests/dph/modules/dph-modules.T
index c9476b6475..6ccac11f30 100644
--- a/testsuite/tests/dph/modules/dph-modules.T
+++ b/testsuite/tests/dph/modules/dph-modules.T
@@ -1,8 +1,4 @@
-test ('dph-ExportList-vseg-fast'
- , [ extra_clean(['ExportList.o', 'ExportList.hi'])
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile
- , [ 'ExportList'
- , '-O0 -package dph-lifted-vseg'])
+test('dph-ExportList-vseg-fast',
+ [reqlib('dph-lifted-vseg'), reqlib('dph-prim-par'),
+ only_ways(['normal', 'threaded1', 'threaded2'])],
+ multimod_compile, ['ExportList', '-O0 -package dph-lifted-vseg'])
diff --git a/testsuite/tests/driver/T12062/all.T b/testsuite/tests/driver/T12062/all.T
index 1372ae3ea5..13147df45f 100644
--- a/testsuite/tests/driver/T12062/all.T
+++ b/testsuite/tests/driver/T12062/all.T
@@ -1,2 +1 @@
-test('T12062', extra_clean(['T12062.o','T12062.hi', 'A.hi', 'A.o', 'A.hi-boot', 'A.o-boot', 'C.hi', 'C.o']),
- multimod_compile_fail, ['T12062', '-v0 -j0'])
+test('T12062', [], multimod_compile_fail, ['T12062', '-v0 -j0'])
diff --git a/testsuite/tests/driver/T1372/all.T b/testsuite/tests/driver/T1372/all.T
index 352d66b5d8..ad269cec86 100644
--- a/testsuite/tests/driver/T1372/all.T
+++ b/testsuite/tests/driver/T1372/all.T
@@ -1,5 +1 @@
-test('T1372',
- clean_cmd('$MAKE -s clean'),
- run_command,
- ['$MAKE -s --no-print-directory T1372'])
-
+test('T1372', [], run_command, ['$MAKE -s --no-print-directory T1372'])
diff --git a/testsuite/tests/driver/T1959/test.T b/testsuite/tests/driver/T1959/test.T
index 563206f09b..8ace579066 100644
--- a/testsuite/tests/driver/T1959/test.T
+++ b/testsuite/tests/driver/T1959/test.T
@@ -1,5 +1 @@
-test('T1959',
- extra_clean(['E.hi', 'E.o', 'E.hs', 'prog', 'compile.out',
- 'B.hi', 'B.o', 'C.hi', 'C.o', 'D.hi', 'D.o']),
- run_command,
- ['$MAKE -s --no-print-directory dotest'])
+test('T1959', [], run_command, ['$MAKE -s --no-print-directory dotest'])
diff --git a/testsuite/tests/driver/T3007/all.T b/testsuite/tests/driver/T3007/all.T
index 194097335d..db5b52bc67 100644
--- a/testsuite/tests/driver/T3007/all.T
+++ b/testsuite/tests/driver/T3007/all.T
@@ -1,5 +1 @@
-test('T3007',
- clean_cmd('$MAKE -s clean'),
- run_command,
- ['$MAKE -s --no-print-directory T3007'])
-
+test('T3007', [], run_command, ['$MAKE -s --no-print-directory T3007'])
diff --git a/testsuite/tests/driver/T437/all.T b/testsuite/tests/driver/T437/all.T
index 2588738941..ff69c47899 100644
--- a/testsuite/tests/driver/T437/all.T
+++ b/testsuite/tests/driver/T437/all.T
@@ -1,7 +1,3 @@
# Test for #437, a recompilation bug with '-main-is'
-test('T437',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory T437'])
-
+test('T437', [], run_command, ['$MAKE -s --no-print-directory T437'])
diff --git a/testsuite/tests/driver/T5147/all.T b/testsuite/tests/driver/T5147/all.T
index 40565edb54..5670cc505b 100644
--- a/testsuite/tests/driver/T5147/all.T
+++ b/testsuite/tests/driver/T5147/all.T
@@ -1,5 +1 @@
-test('T5147',
- [clean_cmd('$MAKE -s clean')],
- run_command,
- ['$MAKE -s --no-print-directory T5147'])
-
+test('T5147', [], run_command, ['$MAKE -s --no-print-directory T5147'])
diff --git a/testsuite/tests/driver/T7373/all.T b/testsuite/tests/driver/T7373/all.T
index c4d83db72e..a03bfcc51c 100644
--- a/testsuite/tests/driver/T7373/all.T
+++ b/testsuite/tests/driver/T7373/all.T
@@ -1,8 +1,2 @@
-test('T7373',
- [extra_clean(['pkg/Setup', 'pkg/Setup.exe', 'pkg/Setup.o', 'pkg/Setup.hi',
- 'D.o', 'D.hi', 'package.conf']),
- clean_cmd('rm -rf pkg/dist/'),
- expect_broken(7373)],
- run_command,
+test('T7373', [expect_broken(7373)], run_command,
['$MAKE -s --no-print-directory T7373'])
-
diff --git a/testsuite/tests/driver/T7835/all.T b/testsuite/tests/driver/T7835/all.T
index 3722f3a55d..d28ddcc95a 100644
--- a/testsuite/tests/driver/T7835/all.T
+++ b/testsuite/tests/driver/T7835/all.T
@@ -1,7 +1,2 @@
-test('T7835',
- extra_clean(['Test', 'Test.exe', 'Test.hi', 'Test.o',
- 'TestPrim.hi', 'TestPrim.o', 'test-prims.o']),
- run_command,
- ['$MAKE -s --no-print-directory T7835'])
-
+test('T7835', [], run_command, ['$MAKE -s --no-print-directory T7835'])
diff --git a/testsuite/tests/driver/T8526/T8526.T b/testsuite/tests/driver/T8526/T8526.T
index 0f0fd40b3a..e5da9a3182 100644
--- a/testsuite/tests/driver/T8526/T8526.T
+++ b/testsuite/tests/driver/T8526/T8526.T
@@ -1 +1 @@
-test('T8526', extra_clean(['A.inc']), ghci_script, ['T8526.script'])
+test('T8526', [], ghci_script, ['T8526.script'])
diff --git a/testsuite/tests/driver/T9562/all.T b/testsuite/tests/driver/T9562/all.T
index 4a45ba50d6..90110c256a 100644
--- a/testsuite/tests/driver/T9562/all.T
+++ b/testsuite/tests/driver/T9562/all.T
@@ -1,4 +1,2 @@
-test('T9562',
- [extra_clean(['A011.hi', 'A011.o']), expect_broken(9562)],
- run_command,
+test('T9562', [expect_broken(9562)], run_command,
['$MAKE -s --no-print-directory T9562'])
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index 380f28845e..17b1206288 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -1,289 +1,102 @@
-test('driver011',
- extra_clean(['A011.hi', 'A011.o']),
- run_command,
- ['$MAKE -s --no-print-directory test011'])
+test('driver011', [], run_command, ['$MAKE -s --no-print-directory test011'])
-test('driver012',
- extra_clean(['A012.hi', 'A012.ooo']),
- run_command,
- ['$MAKE -s --no-print-directory test012'])
+test('driver012', [], run_command, ['$MAKE -s --no-print-directory test012'])
-test('driver013',
- extra_clean(['A013.xhi', 'A013.o']),
- run_command,
- ['$MAKE -s --no-print-directory test013'])
+test('driver013', [], run_command, ['$MAKE -s --no-print-directory test013'])
-test('driver014',
- extra_clean(['A014.hi', 'obj014/A014.o', 'obj014']),
- run_command,
- ['$MAKE -s --no-print-directory test014'])
+test('driver014', [], run_command, ['$MAKE -s --no-print-directory test014'])
-test('driver015',
- extra_clean(['A015.o', 'hi015/A015.hi', 'hi015']),
- run_command,
- ['$MAKE -s --no-print-directory test015'])
+test('driver015', [], run_command, ['$MAKE -s --no-print-directory test015'])
-test('driver016',
- extra_clean(['F016.hi', 'F016.o', 'F016_stub.h']),
- run_command,
- ['$MAKE -s --no-print-directory test016'])
+test('driver016', [], run_command, ['$MAKE -s --no-print-directory test016'])
-test('driver017',
- extra_clean(['F017.hi', 'F017.o',
- 'stub017/TestStub017_stub.h', 'stub017/']),
- run_command,
- ['$MAKE -s --no-print-directory test017'])
+test('driver017', [], run_command, ['$MAKE -s --no-print-directory test017'])
-test('driver018',
- extra_clean(['F018.hi', 'F018_stub.h',
- 'obj018/TestStub018.o', 'obj018/TestStub018_stub.o',
- 'obj018']),
- run_command,
- ['$MAKE -s --no-print-directory test018'])
+test('driver018', [], run_command, ['$MAKE -s --no-print-directory test018'])
-test('driver018a',
- extra_clean(['F018a.hi', 'F018a_stub.h',
- 'F018a.obj.018']),
- run_command,
- ['$MAKE -s --no-print-directory test018a'])
+test('driver018a', [], run_command, ['$MAKE -s --no-print-directory test018a'])
-test('driver019',
- extra_clean(['out019/TestStub019.hi',
- 'out019/TestStub019.o',
- 'out019/TestStub019_stub.h',
- 'out019/TestStub019_stub.o']),
- run_command,
- ['$MAKE -s --no-print-directory test019'])
+test('driver019', [], run_command, ['$MAKE -s --no-print-directory test019'])
-test('driver021',
- extra_clean(['B021/C.hi', 'B021/C.o']),
- run_command,
- ['$MAKE -s --no-print-directory test021'])
+test('driver021', [], run_command, ['$MAKE -s --no-print-directory test021'])
-test('driver022',
- extra_clean(['B022/C.hi', 'B022/C.ooo']),
- run_command,
- ['$MAKE -s --no-print-directory test022'])
+test('driver022', [], run_command, ['$MAKE -s --no-print-directory test022'])
-test('driver023',
- extra_clean(['B023/C.xhi', 'B023/C.o']),
- run_command,
- ['$MAKE -s --no-print-directory test023'])
+test('driver023', [], run_command, ['$MAKE -s --no-print-directory test023'])
-test('driver024',
- extra_clean(['B024/C.hi', 'obj024/B024/C.o', 'obj024/B024', 'obj024']),
- run_command,
- ['$MAKE -s --no-print-directory test024'])
+test('driver024', [], run_command, ['$MAKE -s --no-print-directory test024'])
-test('driver024a',
- extra_clean(['obj024a/B024a/stub.o', 'obj024a/B024a', 'obj024a',
- 'B024a/stub.c', 'B024a/']),
- run_command,
- ['$MAKE -s --no-print-directory test024a'])
+test('driver024a', [], run_command, ['$MAKE -s --no-print-directory test024a'])
-test('driver025',
- extra_clean(['B025/C.hi', 'B025/C.o',
- 'hi025/B025/C.hi', 'hi025/B025', 'hi025']),
- run_command,
- ['$MAKE -s --no-print-directory test025'])
+test('driver025', [], run_command, ['$MAKE -s --no-print-directory test025'])
-test('driver026',
- extra_clean(['d026/P/Q.hi', 'd026/P/Q.o']),
- run_command,
- ['$MAKE -s --no-print-directory test026'])
+test('driver026', [], run_command, ['$MAKE -s --no-print-directory test026'])
-test('driver027',
- extra_clean(['B027/F.hi', 'B027/F.o',
- 'B027/F_stub.h', 'B027/F_stub.o']),
- run_command,
- ['$MAKE -s --no-print-directory test027'])
+test('driver027', [], run_command, ['$MAKE -s --no-print-directory test027'])
-test('driver028',
- extra_clean(['B028/F.hi', 'B028/F.o',
- 'stub028/B028/F_stub.h', 'stub028/B028/', 'stub028/']),
- run_command,
- ['$MAKE -s --no-print-directory test028'])
+test('driver028', [], run_command, ['$MAKE -s --no-print-directory test028'])
-test('driver031',
- extra_clean(['A031.hi', 'A031.o']),
- run_command,
- ['$MAKE -s --no-print-directory test031'])
+test('driver031', [], run_command, ['$MAKE -s --no-print-directory test031'])
-test('driver032',
- extra_clean(['A032.hi', 'obj032/A032.o', 'obj032/']),
- run_command,
- ['$MAKE -s --no-print-directory test032'])
+test('driver032', [], run_command, ['$MAKE -s --no-print-directory test032'])
-test('driver033',
- extra_clean(['A033.hi', 'A033.o', 'hi033/A033.hi', 'hi033']),
- run_command,
- ['$MAKE -s --no-print-directory test033'])
+test('driver033', [], run_command, ['$MAKE -s --no-print-directory test033'])
-test('driver034',
- extra_clean(['F034.hi', 'F034.o', 'F034_stub.h']),
- run_command,
- ['$MAKE -s --no-print-directory test034'])
+test('driver034', [], run_command, ['$MAKE -s --no-print-directory test034'])
-test('driver035',
- extra_clean(['F035.hi', 'F035.o',
- 'stub035/TestStub035_stub.h', 'stub035/']),
- run_command,
- ['$MAKE -s --no-print-directory test035'])
+test('driver035', [], run_command, ['$MAKE -s --no-print-directory test035'])
-test('driver041',
- extra_clean(['B041/C.hi', 'B041/C.o']),
- run_command,
- ['$MAKE -s --no-print-directory test041'])
+test('driver041', [], run_command, ['$MAKE -s --no-print-directory test041'])
-test('driver042',
- extra_clean(['B042/C.hi', 'obj042/B042/C.o', 'obj042/B042/', 'obj042/']),
- run_command,
- ['$MAKE -s --no-print-directory test042'])
+test('driver042', [], run_command, ['$MAKE -s --no-print-directory test042'])
-test('driver042stub',
- extra_clean(['B042stub/C.hi', 'obj042stub/B042stub/C.o', 'obj042stub/B042stub/', 'obj042stub/']),
- run_command,
+test('driver042stub', [], run_command,
['$MAKE -s --no-print-directory test042stub'])
-test('driver043',
- extra_clean(['B043/C.hi', 'B043/C.o',
- 'hi043/B043/C.hi', 'hi043/B043', 'hi043']),
- run_command,
- ['$MAKE -s --no-print-directory test043'])
+test('driver043', [], run_command, ['$MAKE -s --no-print-directory test043'])
-test('driver044',
- extra_clean(['B044/F.hi', 'B044/F.o',
- 'B044/F_stub.h', 'B044/F_stub.o']),
- run_command,
- ['$MAKE -s --no-print-directory test044'])
+test('driver044', [], run_command, ['$MAKE -s --no-print-directory test044'])
-test('driver045',
- extra_clean(['B045/F.hi', 'B045/F.o',
- 'stub045/B045/F_stub.h', 'stub045/B045/', 'stub045/']),
- run_command,
- ['$MAKE -s --no-print-directory test045'])
+test('driver045', [], run_command, ['$MAKE -s --no-print-directory test045'])
-test('driver051',
- extra_clean(['d051_1/P/Q.hi', 'd051_1/P/Q.o',
- 'd051_2/R/S.hi', 'd051_2/R/S.o']),
- run_command,
- ['$MAKE -s --no-print-directory test051'])
-
-test('driver052',
- extra_clean(['d052_1/P/Q.hi', 'd052_1/P/Q.o',
- 'd052_2/R/S.hi', 'd052_2/R/S.o',
- 'obj052/P/Q.o', 'obj052/P',
- 'obj052/R/S.o', 'obj052/R',
- 'obj052']),
- run_command,
- ['$MAKE -s --no-print-directory test052'])
-
-test('driver053',
- extra_clean(['d053_1/P/Q.hi', 'd053_1/P/Q.o',
- 'd053_2/R/S.hi', 'd053_2/R/S.o',
- 'hi053/P/Q.hi', 'hi053/P',
- 'hi053/R/S.hi', 'hi053/R',
- 'hi053']),
- run_command,
- ['$MAKE -s --no-print-directory test053'])
+test('driver051', [], run_command, ['$MAKE -s --no-print-directory test051'])
-test('driver061a',
- extra_clean(['A061a.hi', 'A061a.o', 'A061a.s']),
- run_command,
- ['$MAKE -s --no-print-directory test061a'])
+test('driver052', [], run_command, ['$MAKE -s --no-print-directory test052'])
-test('driver061b',
- extra_clean(['A061b.hi', 'A061b.o', 'A061b.s']),
- run_command,
- ['$MAKE -s --no-print-directory test061b'])
+test('driver053', [], run_command, ['$MAKE -s --no-print-directory test053'])
+test('driver061a', [], run_command, ['$MAKE -s --no-print-directory test061a'])
-test('driver062a',
- extra_clean(['Hello062a.hs', 'Hello062a.hi', 'Hello062a.o',
- 'hello062a', 'hello062a.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test062a'])
-test('driver062b',
- extra_clean(['Hello062b.hs', 'Hello062b.hi', 'Hello062b.o',
- 'hello062b', 'hello062b.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test062b'])
-test('driver062c',
- extra_clean(['Hello062c.hs', 'Hello062c.hi', 'Hello062c.o',
- 'hello062c', 'hello062c.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test062c'])
-test('driver062d',
- extra_clean(['B062d/Hello062d.hi', 'B062d/Hello062d.o',
- 'B062d/Hello062d.hs', 'B062d/',
- 'hello062d', 'hello062d.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test062d'])
-test('driver062e',
- extra_clean(['B062e/Hello062e.hi', 'B062e/Hello062e.o',
- 'B062e/Hello062e.hs', 'B062e/',
- 'hello062e', 'hello062e.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test062e'])
+test('driver061b', [], run_command, ['$MAKE -s --no-print-directory test061b'])
-test('driver063',
- extra_clean(['A063.hi', 'A063.o', 'A063.hc',
- 'D063.hi', 'D063.o', 'D063.hc']),
- run_command,
- ['$MAKE -s --no-print-directory test063'])
-test('driver064',
- extra_clean(['A064.hi', 'A064.o', 'A064.hspp']),
- run_command,
- ['$MAKE -s --no-print-directory test064'])
+test('driver062a', [], run_command, ['$MAKE -s --no-print-directory test062a'])
+test('driver062b', [], run_command, ['$MAKE -s --no-print-directory test062b'])
+test('driver062c', [], run_command, ['$MAKE -s --no-print-directory test062c'])
+test('driver062d', [], run_command, ['$MAKE -s --no-print-directory test062d'])
+test('driver062e', [], run_command, ['$MAKE -s --no-print-directory test062e'])
-test('driver065',
- extra_clean(['A065.hi', 'A065.o', 'A065.hspp']),
- run_command,
- ['$MAKE -s --no-print-directory test065'])
+test('driver063', [], run_command, ['$MAKE -s --no-print-directory test063'])
-test('driver066',
- extra_clean(['A066.hi', 'A066.o', 'A066.tmp']),
- run_command,
- ['$MAKE -s --no-print-directory test066'])
+test('driver064', [], run_command, ['$MAKE -s --no-print-directory test064'])
-test('driver067',
- extra_clean(['A067.hi', 'A067.o', 'A067.tmp']),
- run_command,
- ['$MAKE -s --no-print-directory test067'])
+test('driver065', [], run_command, ['$MAKE -s --no-print-directory test065'])
-test('driver070',
- extra_clean(['A070.hi', 'A070.o', 'A070.s']),
- run_command,
- ['$MAKE -s --no-print-directory test070'])
+test('driver066', [], run_command, ['$MAKE -s --no-print-directory test066'])
-test('driver071',
- extra_clean(['A071.hi', 'A071.o', 'A071.tmp']),
- run_command,
- ['$MAKE -s --no-print-directory test071'])
+test('driver067', [], run_command, ['$MAKE -s --no-print-directory test067'])
-test('driver081a',
- extra_clean(['Test_081a.hs', 'Test_081a.hi', 'Test_081a.o',
- 'Test_081a', 'Test_081a.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test081a'])
+test('driver070', [], run_command, ['$MAKE -s --no-print-directory test070'])
-test('driver081b',
- extra_clean(['Test.081b.hs', 'Test.081b.hi', 'Test.081b.o',
- 'Test.081b', 'Test.081b.exe']),
- run_command,
- ['$MAKE -s --no-print-directory test081b'])
+test('driver071', [], run_command, ['$MAKE -s --no-print-directory test071'])
-test('driver100',
- extra_clean(['overlap/List.hi', 'overlap/List.o',
- 'overlap/Overlap.hi', 'overlap/Overlap.o']),
- run_command,
- ['$MAKE -s --no-print-directory test100'])
+test('driver081a', [], run_command, ['$MAKE -s --no-print-directory test081a'])
-test('driver200',
- extra_clean(['depend200', 'depend200.bak']),
- run_command,
- ['$MAKE -s --no-print-directory test200'])
+test('driver081b', [], run_command, ['$MAKE -s --no-print-directory test081b'])
+
+test('driver100', [], run_command, ['$MAKE -s --no-print-directory test100'])
+
+test('driver200', [], run_command, ['$MAKE -s --no-print-directory test200'])
test('T2566',
normalise_fun(normalise_errmsg),
@@ -303,10 +116,7 @@ if config.os == 'mingw32':
else:
only_windows = skip
-test('shared001',
- [only_windows,
- extra_clean(['Shared001.hi', 'Shared001.o', 'HSdll.dll.a', 'HSdll.dll', 'Shared001_stub.h', 'Shared001_stub.o'])],
- run_command,
+test('shared001', [only_windows], run_command,
['$MAKE -s --no-print-directory shared001'])
if config.os == 'darwin':
@@ -314,10 +124,7 @@ if config.os == 'darwin':
else:
only_darwin = skip
-test('static001',
- [only_darwin, expect_broken(8127),
- extra_clean(['Static001.hi', 'Static001.o', 'liba.a', 'Static001_stub.h', 'Static001_stub.o'])],
- run_command,
+test('static001', [only_darwin, expect_broken(8127)], run_command,
['$MAKE -s --no-print-directory static001'])
test('dynHelloWorld',
@@ -332,24 +139,15 @@ test('T5313',
['-package ghc'])
test('T2464', normal, compile, [''])
-test('T3674',
- [
- extra_clean(['T3674_pre.hi', 'T3674_pre.o', 'T3674_pre', 'T3674_pre.exe'])],
- run_command,
- ['$MAKE -s --no-print-directory T3674'])
+test('T3674', [], run_command, ['$MAKE -s --no-print-directory T3674'])
-test('rtsopts001',
- extra_clean(['rtsOpts.hi', 'rtsOpts.o', 'rtsOpts', 'rtsOpts.exe']),
- run_command,
+test('rtsopts001', [], run_command,
['$MAKE -s --no-print-directory rtsopts001'])
test('rtsopts002', normal, run_command,
['$MAKE -s --no-print-directory rtsopts002'])
-test('withRtsOpts', [ extra_clean(['withRtsOpts', 'withRtsOpts.exe',
- 'withRtsOpts.hi', 'withRtsOpts.o',
- 'withRtsOpts.out']) ],
- run_command,
- ['$MAKE -s --no-print-directory withRtsOpts'])
+test('withRtsOpts', [], run_command,
+ ['$MAKE -s --no-print-directory withRtsOpts'])
test('T3389', normal, compile_and_run, [''])
test('T3364', normalise_fun(normalise_errmsg), run_command,
['$MAKE -s --no-print-directory T3364'])
@@ -362,11 +160,7 @@ test('T4437', only_ways(['normal']), compile_and_run, ['-package ghc'])
test('werror', normal, compile_fail, [''])
-test('T706',
- [req_interp,
- extra_clean(['T706.hs'])],
- run_command,
- ['$MAKE -s --no-print-directory T706'])
+test('T706', [req_interp], run_command, ['$MAKE -s --no-print-directory T706'])
test('spacesInArgs',
extra_run_opts('"a b" "c d"'),
compile_and_run,
@@ -380,19 +174,9 @@ test( 'T4114c', fobject_code, compile_and_run, ['-no-keep-o-files'])
test( 'T4114d', fobject_code, compile_and_run,
['-hisuf .myhi -osuf .myo -no-keep-o-files'])
-test('T5584',
- extra_clean(['T5584_in/A.hi-boot', 'T5584_out/T5584/A.o-boot']),
- run_command, ['$MAKE -s --no-print-directory T5584'])
-test('T5198', extra_clean(['T5198dump/T5198.dump-simpl', 'T5198dump']),
- run_command,
- ['$MAKE -s --no-print-directory T5198'])
-test('T7060',
- extra_clean(['T7060dump/T7060.dump-rules',
- 'T7060dump/T7060.dump-rule-firings',
- 'T7060dump/T7060.dump-rule-rewrites',
- 'T7060dump']),
- run_command,
- ['$MAKE -s --no-print-directory T7060'])
+test('T5584', [], run_command, ['$MAKE -s --no-print-directory T5584'])
+test('T5198', [], run_command, ['$MAKE -s --no-print-directory T5198'])
+test('T7060', [], run_command, ['$MAKE -s --no-print-directory T7060'])
test('T7130', normal, compile_fail, ['-fflul-laziness'])
test('T7563', when(unregisterised(), skip), run_command,
['$MAKE -s --no-print-directory T7563'])
@@ -421,27 +205,17 @@ test('T8101b', expect_broken(10600), multimod_compile,
# Should not panic when compiling cmm file together with -outputdir.
test('T9050', cmm_src, compile, ['-outputdir=.'])
-test('write_interface_oneshot',
- extra_clean(['write_interface_oneshot_hidir/*']),
- run_command,
+test('write_interface_oneshot', [], run_command,
['$MAKE -s --no-print-directory write_interface_oneshot'])
-test('write_interface_make',
- extra_clean(['write_interface_make_hidir/*']),
- run_command,
+test('write_interface_make', [], run_command,
['$MAKE -s --no-print-directory write_interface_make'])
test('T9776', normal, compile_fail, ['-frule-check'])
-test('T9938',
- [ extra_clean(['T9938.hi', 'T9938.o', 'T9938']), normal ],
- run_command,
- ['$MAKE -s --no-print-directory T9938'])
+test('T9938', [], run_command, ['$MAKE -s --no-print-directory T9938'])
-test('T9938B',
- [ extra_clean(['T9938B.hi', 'T9938B.o', 'T9938B']) ],
- run_command,
- ['$MAKE -s --no-print-directory T9938B'])
+test('T9938B', [], run_command, ['$MAKE -s --no-print-directory T9938B'])
test('T9963', exit_code(1), run_command,
['{compiler} --interactive -ignore-dot-ghci --print-libdir'])
@@ -455,17 +229,11 @@ test('T10220', normal, run_command,
# Preprocessed T10220.hspp imports T10220B. Should work in --make mode.
['{compiler} --make T10220.hspp -fno-code -v0'])
-test('T10182',
- extra_clean(['T10182.o', 'T10182a.o', 'T10182.o-boot', 'T10182.hi', 'T10182a.hi', 'T10182.hi-boot']),
- run_command,
- ['$MAKE -s --no-print-directory T10182'])
+test('T10182', [], run_command, ['$MAKE -s --no-print-directory T10182'])
test('T365',
- [extra_clean(['test_preprocessor.txt']),
- pre_cmd('touch test_preprocessor.txt'),
- unless(opsys('mingw32'), skip)],
- compile_fail,
- [''])
+ [pre_cmd('touch test_preprocessor.txt'), unless(opsys('mingw32'), skip)],
+ compile_fail, [''])
test('T9360a', normal, run_command, ['{compiler} --interactive -e "" -ignore-dot-ghci'])
test('T9360b', normal, run_command, ['{compiler} -e "" --interactive -ignore-dot-ghci'])
@@ -479,24 +247,14 @@ test('T11429b', normal, compile, ['-Wno-unrecognised-warning-flags -Wfoobar'])
test('T11429c', normal, compile_fail, ['-Wunrecognised-warning-flags -Werror -Wfoobar'])
test('T11763', normal, compile_and_run, ['-fno-version-macros'])
-test('T10320',
- [
- extra_clean(['T10320', 'T10320.o', 'T10320.hi'])],
- run_command,
- ['$MAKE -s --no-print-directory T10320'])
+test('T10320', [], run_command, ['$MAKE -s --no-print-directory T10320'])
-test('T12135',
- [expect_broken(12135),
- extra_clean(['T12135.o', 'T12135.hi', 'T12135', 'T12135a/T12135.h', 'T12135b/T12135.h'])],
- run_command,
+test('T12135', [expect_broken(12135)], run_command,
['$MAKE -s --no-print-directory T12135'])
test('T12192', normal, run_command, ['mkdir foo && (cd foo && {compiler} -v0 ../T12192)'])
-test('T10923',
- extra_clean(['T10923.o', 'T10923.hi']),
- run_command,
- ['$MAKE -s --no-print-directory T10923'])
+test('T10923', [], run_command, ['$MAKE -s --no-print-directory T10923'])
test('T12752pass', normal, compile, ['-DSHOULD_PASS=1 -Wcpp-undef'])
diff --git a/testsuite/tests/driver/dynamicToo/all.T b/testsuite/tests/driver/dynamicToo/all.T
index 11a0b98006..5df706ec4c 100644
--- a/testsuite/tests/driver/dynamicToo/all.T
+++ b/testsuite/tests/driver/dynamicToo/all.T
@@ -1,8 +1,4 @@
test('dynamicToo003',
- [extra_clean(['A003.o', 'A003.hi', 'A003.dyn_o', 'A003.dyn_hi']),
- unless(have_vanilla(), skip),
- unless(have_dynamic(), skip)],
- run_command,
+ [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
['$MAKE -s --no-print-directory dynamicToo003'])
-
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
index 121459309a..7b5398b78d 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
@@ -1,12 +1,5 @@
test('dynamicToo001',
- [extra_clean(['A.o', 'A.hi', 'A.dyn_o', 'A.dyn_hi',
- 'B.o', 'B.hi', 'B.dyn_o', 'B.dyn_hi',
- 'C.o', 'C.hi', 'C.dyn_o', 'C.dyn_hi',
- 's', 's.exe', 'd', 'd.exe']),
- when(opsys('mingw32'), expect_broken(7665)),
- unless(have_vanilla(), skip),
+ [when(opsys('mingw32'), expect_broken(7665)), unless(have_vanilla(), skip),
unless(have_dynamic(), skip)],
- run_command,
- ['$MAKE -s --no-print-directory dynamicToo001'])
-
+ run_command, ['$MAKE -s --no-print-directory dynamicToo001'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
index 592e62f554..1e307eb9d4 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
@@ -1,10 +1,4 @@
test('dynamicToo002',
- [extra_clean(['A.o', 'A.hi', 'A.dyn_o', 'A.dyn_hi',
- 'B.o', 'B.hi', 'B.dyn_o', 'B.dyn_hi',
- 'C.o', 'C.hi', 'C.dyn_o', 'C.dyn_hi']),
- unless(have_vanilla(), skip),
- unless(have_dynamic(), skip)],
- run_command,
+ [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
['$MAKE -s --no-print-directory dynamicToo002'])
-
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
index 48460f5135..5a31c981b3 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
@@ -1,8 +1,4 @@
test('dynamicToo005',
- [extra_clean(['A005.o', 'A005.hi', 'A005.dyn_o', 'A005.dyn_hi']),
- unless(have_vanilla(), skip),
- unless(have_dynamic(), skip)],
- run_command,
+ [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
['$MAKE -s --no-print-directory dynamicToo005'])
-
diff --git a/testsuite/tests/driver/dynamic_flags_001/all.T b/testsuite/tests/driver/dynamic_flags_001/all.T
index 19ed656e7f..29159741de 100644
--- a/testsuite/tests/driver/dynamic_flags_001/all.T
+++ b/testsuite/tests/driver/dynamic_flags_001/all.T
@@ -1,6 +1,2 @@
-test('dynamic_flags_001',
- [when(fast(), skip),
- clean_cmd('$MAKE -s clean')],
- run_command,
+test('dynamic_flags_001', [when(fast(), skip)], run_command,
['$MAKE -s --no-print-directory dynamic_flags_001'])
-
diff --git a/testsuite/tests/driver/recomp001/all.T b/testsuite/tests/driver/recomp001/all.T
index 33202d6241..9b133d8a8a 100644
--- a/testsuite/tests/driver/recomp001/all.T
+++ b/testsuite/tests/driver/recomp001/all.T
@@ -1,6 +1,2 @@
-test('recomp001',
- [when(fast(), skip),
- clean_cmd('$MAKE -s clean')],
- run_command,
+test('recomp001', [when(fast(), skip)], run_command,
['$MAKE -s --no-print-directory recomp001'])
-
diff --git a/testsuite/tests/driver/recomp002/all.T b/testsuite/tests/driver/recomp002/all.T
index 68f1a7967e..c1fc00fc6a 100644
--- a/testsuite/tests/driver/recomp002/all.T
+++ b/testsuite/tests/driver/recomp002/all.T
@@ -1,6 +1,2 @@
-test('recomp002',
- [when(fast(), skip),
- clean_cmd('$MAKE -s clean')],
- run_command,
+test('recomp002', [when(fast(), skip)], run_command,
['$MAKE -s --no-print-directory recomp002'])
-
diff --git a/testsuite/tests/driver/recomp003/all.T b/testsuite/tests/driver/recomp003/all.T
index c6653c2723..ddef73575b 100644
--- a/testsuite/tests/driver/recomp003/all.T
+++ b/testsuite/tests/driver/recomp003/all.T
@@ -1,6 +1 @@
-test('recomp003',
- extra_clean(['Data/Char.hs', 'Data/Char.hi', 'Data/Char.o',
- 'A.o', 'A.hi',
- 'err']),
- run_command,
- ['$MAKE -s --no-print-directory recomp003'])
+test('recomp003', [], run_command, ['$MAKE -s --no-print-directory recomp003'])
diff --git a/testsuite/tests/driver/recomp004/all.T b/testsuite/tests/driver/recomp004/all.T
index 5ec5166bd1..787147b2fc 100644
--- a/testsuite/tests/driver/recomp004/all.T
+++ b/testsuite/tests/driver/recomp004/all.T
@@ -1,5 +1 @@
-test('recomp004',
- extra_clean(['MainX', 'MainX.exe', 'MainX.hi', 'MainX.o', 'MainX.hs',
- 'c.o', 'c.c']),
- run_command,
- ['$MAKE -s --no-print-directory recomp004'])
+test('recomp004', [], run_command, ['$MAKE -s --no-print-directory recomp004'])
diff --git a/testsuite/tests/driver/recomp005/all.T b/testsuite/tests/driver/recomp005/all.T
index 5282c5b685..64ec8b0f4f 100644
--- a/testsuite/tests/driver/recomp005/all.T
+++ b/testsuite/tests/driver/recomp005/all.T
@@ -1,5 +1,2 @@
-test('recomp005',
- [when(fast(), skip),
- clean_cmd('$MAKE -s clean')],
- run_command, ['$MAKE -s --no-print-directory recomp005'])
-
+test('recomp005', [when(fast(), skip)], run_command,
+ ['$MAKE -s --no-print-directory recomp005'])
diff --git a/testsuite/tests/driver/recomp006/all.T b/testsuite/tests/driver/recomp006/all.T
index f234e58e87..44d33c03ce 100644
--- a/testsuite/tests/driver/recomp006/all.T
+++ b/testsuite/tests/driver/recomp006/all.T
@@ -1,4 +1,2 @@
-test('recomp006',
- [ when(fast(), skip),
- extra_clean(['A.o','A.hi','B.o','B.hi','err','out']) ],
- run_command, ['$MAKE -s --no-print-directory recomp006'])
+test('recomp006', [when(fast(), skip)], run_command,
+ ['$MAKE -s --no-print-directory recomp006'])
diff --git a/testsuite/tests/driver/recomp007/all.T b/testsuite/tests/driver/recomp007/all.T
index de562b6277..e123cbaba3 100644
--- a/testsuite/tests/driver/recomp007/all.T
+++ b/testsuite/tests/driver/recomp007/all.T
@@ -2,8 +2,5 @@
# See the patch
# "Fix a recompilation checking bug when a package dependency changes"
-test('recomp007',
- [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
- run_command,
+test('recomp007', [when(fast(), skip), normalise_slashes], run_command,
['$MAKE -s --no-print-directory recomp007'])
-
diff --git a/testsuite/tests/driver/recomp008/all.T b/testsuite/tests/driver/recomp008/all.T
index caf81d5ba9..aa147826bf 100644
--- a/testsuite/tests/driver/recomp008/all.T
+++ b/testsuite/tests/driver/recomp008/all.T
@@ -1,7 +1,4 @@
# Test for #4469, a recompilation bug related to instances
-test('recomp008',
- [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
- run_command,
+test('recomp008', [when(fast(), skip), normalise_slashes], run_command,
['$MAKE -s --no-print-directory recomp008'])
-
diff --git a/testsuite/tests/driver/recomp009/all.T b/testsuite/tests/driver/recomp009/all.T
index 368f6cf2f8..519933ac81 100644
--- a/testsuite/tests/driver/recomp009/all.T
+++ b/testsuite/tests/driver/recomp009/all.T
@@ -1,7 +1,3 @@
# Test for #481, a recompilation bug with Template Haskell
-test('recomp009',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp009'])
-
+test('recomp009', [], run_command, ['$MAKE -s --no-print-directory recomp009'])
diff --git a/testsuite/tests/driver/recomp010/all.T b/testsuite/tests/driver/recomp010/all.T
index 23708bb0c6..1fd1e2a0fa 100644
--- a/testsuite/tests/driver/recomp010/all.T
+++ b/testsuite/tests/driver/recomp010/all.T
@@ -1,7 +1,3 @@
# Test for #5614, a recompilation bug
-test('recomp010',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp010'])
-
+test('recomp010', [], run_command, ['$MAKE -s --no-print-directory recomp010'])
diff --git a/testsuite/tests/driver/recomp011/all.T b/testsuite/tests/driver/recomp011/all.T
index e5a4287147..1dd66b8027 100644
--- a/testsuite/tests/driver/recomp011/all.T
+++ b/testsuite/tests/driver/recomp011/all.T
@@ -1,8 +1,5 @@
# Test for #3589, recompiling when #included files change
test('recomp011',
- [ when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11260)),
- clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp011'])
-
+ [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11260))],
+ run_command, ['$MAKE -s --no-print-directory recomp011'])
diff --git a/testsuite/tests/driver/recomp012/all.T b/testsuite/tests/driver/recomp012/all.T
index 869fae7501..b1b599ecd4 100644
--- a/testsuite/tests/driver/recomp012/all.T
+++ b/testsuite/tests/driver/recomp012/all.T
@@ -1,7 +1,3 @@
# Test for #7215, a recompilation bug
-test('recomp012',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp012'])
-
+test('recomp012', [], run_command, ['$MAKE -s --no-print-directory recomp012'])
diff --git a/testsuite/tests/driver/recomp013/all.T b/testsuite/tests/driver/recomp013/all.T
index a40255a53c..9481b01bd8 100644
--- a/testsuite/tests/driver/recomp013/all.T
+++ b/testsuite/tests/driver/recomp013/all.T
@@ -1,7 +1,3 @@
# Test for #8247, a recompilation bug
-test('recomp013',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp013'])
-
+test('recomp013', [], run_command, ['$MAKE -s --no-print-directory recomp013'])
diff --git a/testsuite/tests/driver/recomp016/all.T b/testsuite/tests/driver/recomp016/all.T
index a1a2ebd55a..45e2b4e8de 100644
--- a/testsuite/tests/driver/recomp016/all.T
+++ b/testsuite/tests/driver/recomp016/all.T
@@ -1,7 +1,3 @@
# Test for #12723, a recompilation bug
-test('recomp016',
- [ clean_cmd('$MAKE -s clean') ],
- run_command,
- ['$MAKE -s --no-print-directory recomp016'])
-
+test('recomp016', [], run_command, ['$MAKE -s --no-print-directory recomp016'])
diff --git a/testsuite/tests/driver/recomp017/all.T b/testsuite/tests/driver/recomp017/all.T
index 1ba5343b9c..ac473e04c8 100644
--- a/testsuite/tests/driver/recomp017/all.T
+++ b/testsuite/tests/driver/recomp017/all.T
@@ -1,11 +1,6 @@
# Test for #13099, a recompilation bug involving type family instances
test('recomp017',
- [ clean_cmd('$MAKE -s clean'),
- extra_files(['A.hs', 'B.hs', 'C.hs', 'C2.hs',
- 'D.hs', 'E.hs']),
- ignore_stdout,
- expect_broken(13099) ],
- run_command,
- ['$MAKE -s --no-print-directory recomp017'])
-
+ [extra_files(['A.hs', 'B.hs', 'C.hs', 'C2.hs', 'D.hs', 'E.hs']),
+ ignore_stdout, expect_broken(13099)],
+ run_command, ['$MAKE -s --no-print-directory recomp017'])
diff --git a/testsuite/tests/driver/retc002/all.T b/testsuite/tests/driver/retc002/all.T
index 47794fbe39..54267f3865 100644
--- a/testsuite/tests/driver/retc002/all.T
+++ b/testsuite/tests/driver/retc002/all.T
@@ -1,6 +1,2 @@
-test('retc002',
- [when(fast(), skip),
- clean_cmd('$MAKE -s clean')],
- run_command,
+test('retc002', [when(fast(), skip)], run_command,
['$MAKE -s --no-print-directory retc002'])
-
diff --git a/testsuite/tests/driver/retc003/all.T b/testsuite/tests/driver/retc003/all.T
index 836ee62676..4d97b18f6a 100644
--- a/testsuite/tests/driver/retc003/all.T
+++ b/testsuite/tests/driver/retc003/all.T
@@ -1,6 +1 @@
-test('retc003',
- extra_clean(['Data/Char.hs', 'Data/Char.hi', 'Data/Char.o',
- 'A.o', 'A.hi',
- 'err']),
- run_command,
- ['$MAKE -s --no-print-directory retc003'])
+test('retc003', [], run_command, ['$MAKE -s --no-print-directory retc003'])
diff --git a/testsuite/tests/dynlibs/all.T b/testsuite/tests/dynlibs/all.T
index 6a9dfd9655..0713fe491e 100644
--- a/testsuite/tests/dynlibs/all.T
+++ b/testsuite/tests/dynlibs/all.T
@@ -1,32 +1,9 @@
-test('T3807',
- [req_shared_libs,
- extra_clean(['T3807Export_stub.c', 'T3807Export_stub.h',
- 'T3807Export_stub.o',
- 'T3807Export.o', 'T3807Export.hi',
- 'T3807-export.o', 'T3807-load.o',
- 'T3807test.so',
- 'T3807-load']),
- when(opsys('mingw32'), skip)],
- run_command,
+test('T3807', [req_shared_libs, when(opsys('mingw32'), skip)], run_command,
['$MAKE --no-print-directory -s T3807'])
-test('T4464',
- [req_shared_libs,
- extra_clean(['T4464B.o', 'T4464C.o', 'T4464H.hi', 'T4464H.o',
- 'T4464H_stub.c', 'T4464H_stub.h', 'T4464H_stub.o',
- 'HS4464.dll', 'HS4464.dll.a', 't4464.exe']),
- unless(opsys('mingw32'), skip)],
- run_command,
+test('T4464', [req_shared_libs, unless(opsys('mingw32'), skip)], run_command,
['$MAKE --no-print-directory -s T4464'])
-test('T5373',
- [req_shared_libs,
- extra_clean(['T5373A.hi', 'T5373B.hi', 'T5373C.hi', 'T5373D.hi',
- 'T5373A.o', 'T5373B.o', 'T5373C.o', 'T5373D.o',
- 'T5373A', 'T5373B', 'T5373C', 'T5373D',
- 'T5373A.exe', 'T5373B.exe', 'T5373C.exe', 'T5373D.exe'])
- ],
- run_command,
+test('T5373', [req_shared_libs], run_command,
['$MAKE --no-print-directory -s T5373'])
-
diff --git a/testsuite/tests/ffi/should_compile/all.T b/testsuite/tests/ffi/should_compile/all.T
index dac31aeec6..18192d49ff 100644
--- a/testsuite/tests/ffi/should_compile/all.T
+++ b/testsuite/tests/ffi/should_compile/all.T
@@ -30,5 +30,4 @@ test('T3742', normal, compile, [''])
test('cc015', normal, compile, [''])
test('cc016', normal, compile, [''])
test('T10460', normal, compile, [''])
-test('T11983', [ omit_ways(['ghci']), extra_clean(['T11983.o']) ],
- compile, ['T11983.c'])
+test('T11983', [omit_ways(['ghci'])], compile, ['T11983.c'])
diff --git a/testsuite/tests/ffi/should_fail/all.T b/testsuite/tests/ffi/should_fail/all.T
index e642ac2e9a..543835a70e 100644
--- a/testsuite/tests/ffi/should_fail/all.T
+++ b/testsuite/tests/ffi/should_fail/all.T
@@ -6,10 +6,7 @@ test('ccfail001', normal, compile_fail, [''])
test('ccfail002', normal, compile_fail, [''])
test('ccfail003', normal, compile_fail, [''])
test('T3066', normal, compile_fail, [''])
-test('ccfail004',
- extra_clean(['Ccfail004A.hi', 'Ccfail004A.o']),
- multimod_compile_fail,
- ['ccfail004', '-v0'])
+test('ccfail004', [], multimod_compile_fail, ['ccfail004', '-v0'])
test('ccfail005', normal, compile_fail, [''])
test('ccall_value', normal, compile_fail, [''])
test('capi_value_function', normal, compile_fail, [''])
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index 4e7417395d..38f0288410 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -71,43 +71,36 @@ test('ffi012', skip_if_not_windows, compile_and_run, [''])
test('ffi013', normal, compile_and_run, [''])
# threaded2 sometimes gives ffi014: Main_dDu: interrupted
-test('ffi014',
- [only_ways(['threaded1','threaded2']), extra_clean(['ffi014_cbits.o'])],
- compile_and_run, ['ffi014_cbits.c'])
+test('ffi014', [only_ways(['threaded1', 'threaded2'])], compile_and_run,
+ ['ffi014_cbits.c'])
# GHCi can't handle the separate C file (ToDo: fix this somehow)
-test('ffi015', [ omit_ways(['ghci']), extra_clean(['ffi015_cbits.o']) ],
- compile_and_run, ['ffi015_cbits.c'])
+test('ffi015', [omit_ways(['ghci'])], compile_and_run, ['ffi015_cbits.c'])
# GHCi can't handle foreign import "&"
test('ffi016', omit_ways(['ghci']), compile_and_run, [''])
test('ffi017', normal, compile_and_run, [''])
-test('ffi018', [ omit_ways(['ghci']), extra_clean(['ffi018_c.o']) ],
- compile_and_run, ['ffi018_c.c'])
+test('ffi018', [omit_ways(['ghci'])], compile_and_run, ['ffi018_c.c'])
-test('ffi018_ghci', [ only_ways(['ghci']),
- pre_cmd('$MAKE -s --no-print-directory ffi018_ghci_setup'),
- extra_clean(['ffi018_ghci_c.o']) ],
- compile_and_run, ['ffi018_ghci_c.o'])
+test('ffi018_ghci',
+ [only_ways(['ghci']),
+ pre_cmd('$MAKE -s --no-print-directory ffi018_ghci_setup')],
+ compile_and_run, ['ffi018_ghci_c.o'])
test('ffi019', normal, compile_and_run, [''])
# This one originally failed only GHCi, but doesn't hurt to test all ways.
test('T1679', normal, compile_and_run, [''])
-test('T1288', [ omit_ways(['ghci']),
- extra_clean(['T1288_c.o']) ],
- compile_and_run, ['T1288_c.c'])
-test('T1288_ghci', [ only_ways(['ghci']),
- pre_cmd('$MAKE -s --no-print-directory T1288_ghci_setup'),
- extra_clean(['T1288_ghci_c.o']) ],
- compile_and_run, ['T1288_ghci_c.o'])
-
-test('T2276', [ omit_ways(['ghci']),
- extra_clean(['T2276_c.o']) ],
- compile_and_run, ['T2276_c.c'])
+test('T1288', [omit_ways(['ghci'])], compile_and_run, ['T1288_c.c'])
+test('T1288_ghci',
+ [only_ways(['ghci']),
+ pre_cmd('$MAKE -s --no-print-directory T1288_ghci_setup')],
+ compile_and_run, ['T1288_ghci_c.o'])
+
+test('T2276', [omit_ways(['ghci'])], compile_and_run, ['T2276_c.c'])
test('T2276_ghci', [ only_ways(['ghci']),
when(opsys('darwin'), skip), # stdcall not supported on OS X
pre_cmd('$MAKE -s --no-print-directory T2276_ghci_setup'),
@@ -116,18 +109,13 @@ test('T2276_ghci', [ only_ways(['ghci']),
test('T2469', normal, compile_and_run, ['-optc-std=gnu99'])
-test('T2594',
- [extra_clean(['T2594_c.o']), omit_ways(['ghci'])],
- compile_and_run,
- ['T2594_c.c'])
+test('T2594', [omit_ways(['ghci'])], compile_and_run, ['T2594_c.c'])
-test('fptr01', [ omit_ways(['ghci']), extra_clean(['fptr01_c.o']) ],
- compile_and_run, ['fptr01_c.c'])
+test('fptr01', [omit_ways(['ghci'])], compile_and_run, ['fptr01_c.c'])
test('fptr02', normal, compile_and_run, [''])
-test('fptrfail01', [ omit_ways(['ghci']), exit_code(1),
- extra_clean(['fptrfail01_c.o']) ],
- compile_and_run, ['fptrfail01_c.c'])
+test('fptrfail01', [omit_ways(['ghci']), exit_code(1)], compile_and_run,
+ ['fptrfail01_c.c'])
test('T2917a', normal, compile_and_run, [''])
@@ -148,8 +136,7 @@ else:
flagsForT4038 = ['']
test('T4038', normal, compile_and_run, flagsForT4038)
-test('T4221', [ omit_ways(['ghci']), extra_clean(['T4221_c.o']) ],
- compile_and_run, ['T4221_c.c'])
+test('T4221', [omit_ways(['ghci'])], compile_and_run, ['T4221_c.c'])
test('T5402', [ omit_ways(['ghci']),
exit_code(42),
@@ -168,41 +155,23 @@ test('T5594', [ omit_ways(['ghci']),
# needs it.
compile_and_run, ['T5594_c.c -no-hs-main'])
-test('Capi_Ctype_001',
- extra_clean(['Capi_Ctype_A_001.o', 'Capi_Ctype_A_001.hi',
- 'capi_ctype_001_c.o',
- 'Capi_Ctype_A_001.hs', 'Capi_Ctype_001.hs']),
- run_command,
+test('Capi_Ctype_001', [], run_command,
['$MAKE -s --no-print-directory Capi_Ctype_001'])
-test('Capi_Ctype_002',
- extra_clean(['Capi_Ctype_A_002.o', 'Capi_Ctype_A_002.hi',
- 'Capi_Ctype_A_002.hs']),
- run_command,
+test('Capi_Ctype_002', [], run_command,
['$MAKE -s --no-print-directory Capi_Ctype_002'])
-test('ffi_parsing_001',
- [omit_ways(['ghci']), extra_clean(['ffi_parsing_001_c.o'])],
- compile_and_run,
+test('ffi_parsing_001', [omit_ways(['ghci'])], compile_and_run,
['ffi_parsing_001_c.c'])
-test('capi_value',
- [omit_ways(['ghci']), extra_clean(['capi_value_c.o'])],
- compile_and_run,
- ['capi_value_c.c'])
+test('capi_value', [omit_ways(['ghci'])], compile_and_run, ['capi_value_c.c'])
test('T7170', exit_code(1), compile_and_run, [''])
-test('T4012',
- [extra_clean(['T4012_A.hi', 'T4012_A.o', 'T4012_B.hi', 'T4012_B.o']),
- expect_broken_for(7388, ['ghci'])],
- multimod_compile_and_run,
+test('T4012', [expect_broken_for(7388, ['ghci'])], multimod_compile_and_run,
['T4012', ''])
-test('T8083',
- [omit_ways(['ghci']), extra_clean(['T8083_c.o'])],
- compile_and_run,
- ['T8083_c.c'])
+test('T8083', [omit_ways(['ghci'])], compile_and_run, ['T8083_c.c'])
test('ffi023', [ omit_ways(['ghci']),
extra_clean(['ffi023_c.o']),
@@ -213,13 +182,6 @@ test('ffi023', [ omit_ways(['ghci']),
# needs it.
compile_and_run, ['ffi023_c.c'])
-test('T12134',
- [omit_ways(['ghci']), extra_clean(['T12134_c.o'])],
- compile_and_run,
- ['T12134_c.c'])
-
-test('T12614',
- [omit_ways(['ghci']), extra_clean(['T12614_c.o'])],
- compile_and_run,
- ['T12614_c.c'])
+test('T12134', [omit_ways(['ghci'])], compile_and_run, ['T12134_c.c'])
+test('T12614', [omit_ways(['ghci'])], compile_and_run, ['T12614_c.c'])
diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T
index d5873c907f..2bae2696b4 100644
--- a/testsuite/tests/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
@@ -19,10 +19,7 @@ test('gadt14', normal, compile, [''])
test('gadt15', normal, compile, [''])
test('gadt16', normal, compile, [''])
-test('gadt17',
- extra_clean(['Gadt17_help.hi', 'Gadt17_help.o']),
- run_command,
- ['$MAKE -s --no-print-directory gadt17'])
+test('gadt17', [], run_command, ['$MAKE -s --no-print-directory gadt17'])
test('gadt18', normal, compile, [''])
test('gadt19', normal, compile, [''])
@@ -30,10 +27,7 @@ test('gadt20', normal, compile, [''])
test('gadt21', normal, compile_fail, [''])
test('gadt22', normal, compile, [''])
-test('gadt23',
- extra_clean(['Gadt23_AST.hi', 'Gadt23_AST.o']),
- run_command,
- ['$MAKE -s --no-print-directory gadt23'])
+test('gadt23', [], run_command, ['$MAKE -s --no-print-directory gadt23'])
test('gadt24', normal, compile, [''])
@@ -107,19 +101,13 @@ test('gadtSyntaxFail001', normal, compile_fail, [''])
test('gadtSyntaxFail002', normal, compile_fail, [''])
test('gadtSyntaxFail003', normal, compile_fail, [''])
test('T3169', normal, compile_fail, [''])
-test('T5424',
- extra_clean(['T5424a.hi', 'T5424a.o']),
- multimod_compile,
- ['T5424', '-v0 -O0'])
+test('T5424', [], multimod_compile, ['T5424', '-v0 -O0'])
test('FloatEq', normal, compile, [''])
test('T7205', normal, compile, [''])
test('T7293', normal, compile_fail, [''])
test('T7294', normal, compile, [''])
-test('T7321',
- extra_clean(['T7321a.hi', 'T7321a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T7321'])
+test('T7321', [], run_command, ['$MAKE -s --no-print-directory T7321'])
test('T7974', normal, compile, [''])
test('T7558', normal, compile_fail, [''])
test('T9096', normal, compile, [''])
diff --git a/testsuite/tests/generics/GEq/test.T b/testsuite/tests/generics/GEq/test.T
index b3ed756b30..689b01ac11 100644
--- a/testsuite/tests/generics/GEq/test.T
+++ b/testsuite/tests/generics/GEq/test.T
@@ -1,3 +1,2 @@
-test('GEq1', extra_clean(['GEq1A.hi', 'GEq1A.o']),
- multimod_compile_and_run, ['GEq1', ''])
+test('GEq1', [], multimod_compile_and_run, ['GEq1', ''])
test('GEq2', normal, multimod_compile_and_run, ['GEq2', ''])
diff --git a/testsuite/tests/generics/GFunctor/test.T b/testsuite/tests/generics/GFunctor/test.T
index b9ccb934e0..b18e2ee67a 100644
--- a/testsuite/tests/generics/GFunctor/test.T
+++ b/testsuite/tests/generics/GFunctor/test.T
@@ -1,2 +1 @@
-test('GFunctor1', extra_clean(['GFunctor.hi', 'GFunctor.o', 'Main.hi', 'Main.o']),
- multimod_compile_and_run, ['Main', ''])
+test('GFunctor1', [], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/generics/GMap/test.T b/testsuite/tests/generics/GMap/test.T
index a78d4e99b8..79536c0e43 100644
--- a/testsuite/tests/generics/GMap/test.T
+++ b/testsuite/tests/generics/GMap/test.T
@@ -1,2 +1 @@
-test('GMap1', extra_clean(['GMap.hi', 'GMap.o', 'Main.hi', 'Main.o']),
- multimod_compile_and_run, ['Main', ''])
+test('GMap1', [], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/generics/GShow/test.T b/testsuite/tests/generics/GShow/test.T
index be34df3e8c..af1dc279db 100644
--- a/testsuite/tests/generics/GShow/test.T
+++ b/testsuite/tests/generics/GShow/test.T
@@ -1,2 +1 @@
-test('GShow1', extra_clean(['GShow.hi', 'GShow.o', 'Main.hi', 'Main.o']),
- multimod_compile_and_run, ['Main', ''])
+test('GShow1', [], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/generics/Uniplate/test.T b/testsuite/tests/generics/Uniplate/test.T
index 8acd0ea4ad..1e99941bd4 100644
--- a/testsuite/tests/generics/Uniplate/test.T
+++ b/testsuite/tests/generics/Uniplate/test.T
@@ -1,3 +1 @@
-test('GUniplate1', extra_clean(['GUniplate.hi', 'GUniplate.o',
- 'Main.hi', 'Main.o']),
- multimod_compile_and_run, ['Main', ''])
+test('GUniplate1', [], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T
index 6bf949fc3b..2c67654aeb 100644
--- a/testsuite/tests/generics/all.T
+++ b/testsuite/tests/generics/all.T
@@ -26,17 +26,13 @@ test('T5462Yes2', outputdir('out_T5462Yes2')
test('T5462No1', outputdir('out_T5462No1')
, multimod_compile_fail, ['T5462No1', '-iGFunctor'])
-test('T5884', extra_clean(['T5884Other.o', 'T5884Other.hi'])
- , multimod_compile, ['T5884Other', '-v0'])
+test('T5884', [], multimod_compile, ['T5884Other', '-v0'])
test('GenNewtype', normal, compile_and_run, [''])
test('GenDerivOutput1_0', normal, compile, ['-dsuppress-uniques'])
test('GenDerivOutput1_1', normal, compile, ['-dsuppress-uniques'])
-test('T7878', extra_clean(['T7878A.o' ,'T7878A.hi'
- ,'T7878A.o-boot','T7878A.hi-boot'
- ,'T7878B.o' ,'T7878B.hi']),
- multimod_compile, ['T7878', '-v0'])
+test('T7878', [], multimod_compile, ['T7878', '-v0'])
test('T8468', normal, compile_fail, [''])
test('T8479', normal, compile, [''])
diff --git a/testsuite/tests/ghc-api/T4891/all.T b/testsuite/tests/ghc-api/T4891/all.T
index b9c08c37bf..65aeddcbb6 100644
--- a/testsuite/tests/ghc-api/T4891/all.T
+++ b/testsuite/tests/ghc-api/T4891/all.T
@@ -1,3 +1 @@
-test('T4891', extra_clean(['X.hi', 'X.o']),
- run_command,
- ['$MAKE -s --no-print-directory T4891'])
+test('T4891', [], run_command, ['$MAKE -s --no-print-directory T4891'])
diff --git a/testsuite/tests/ghc-api/T7478/all.T b/testsuite/tests/ghc-api/T7478/all.T
index 01d2dc0509..625d4fcdc3 100644
--- a/testsuite/tests/ghc-api/T7478/all.T
+++ b/testsuite/tests/ghc-api/T7478/all.T
@@ -1,7 +1,2 @@
-test('T7478',
- [ unless(have_dynamic(),skip)
- , extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi'])
- ],
- run_command,
- ['$MAKE -s --no-print-directory T7478'])
-
+test('T7478', [unless(have_dynamic(), skip)], run_command,
+ ['$MAKE -s --no-print-directory T7478'])
diff --git a/testsuite/tests/ghc-api/annotations-literals/all.T b/testsuite/tests/ghc-api/annotations-literals/all.T
index bef7049f8f..311f2cf81a 100644
--- a/testsuite/tests/ghc-api/annotations-literals/all.T
+++ b/testsuite/tests/ghc-api/annotations-literals/all.T
@@ -1,4 +1,2 @@
-test('literals', extra_clean(['LiteralsTest.o', 'LiteralsTest.hi']),
- run_command, ['$MAKE -s --no-print-directory literals'])
-test('parsed', extra_clean(['LiteralsTest2.o', 'LiteralsTest2.hi']),
- run_command, ['$MAKE -s --no-print-directory parsed'])
+test('literals', [], run_command, ['$MAKE -s --no-print-directory literals'])
+test('parsed', [], run_command, ['$MAKE -s --no-print-directory parsed'])
diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T
index 6313335303..e87e94197f 100644
--- a/testsuite/tests/ghci.debugger/scripts/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/all.T
@@ -43,8 +43,7 @@ test('break002', normal, ghci_script, ['break002.script'])
test('break003', normal, ghci_script, ['break003.script'])
test('break005', normal, ghci_script, ['break005.script'])
test('break006', normal, ghci_script, ['break006.script'])
-test('break007', extra_clean(['Break007.o', 'Break007.hi']),
- ghci_script, ['break007.script'])
+test('break007', [], ghci_script, ['break007.script'])
test('break008', normal, ghci_script, ['break008.script'])
test('break009', combined_output, ghci_script, ['break009.script'])
test('break010', normal, ghci_script, ['break010.script'])
diff --git a/testsuite/tests/ghci.debugger/scripts/break022/all.T b/testsuite/tests/ghci.debugger/scripts/break022/all.T
index 546a8f45ca..bbecaba442 100644
--- a/testsuite/tests/ghci.debugger/scripts/break022/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/break022/all.T
@@ -1,3 +1,3 @@
setTestOpts(extra_run_opts('-ignore-dot-ghci'))
-test('break022', extra_clean(['A.hs']), ghci_script, ['break022.script'])
+test('break022', [], ghci_script, ['break022.script'])
diff --git a/testsuite/tests/ghci.debugger/scripts/break023/all.T b/testsuite/tests/ghci.debugger/scripts/break023/all.T
index ac747d4461..bc6502239d 100644
--- a/testsuite/tests/ghci.debugger/scripts/break023/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/break023/all.T
@@ -1,3 +1,3 @@
setTestOpts(extra_run_opts('-ignore-dot-ghci'))
-test('break023', extra_clean(['A.hs']), ghci_script, ['break023.script'])
+test('break023', [], ghci_script, ['break023.script'])
diff --git a/testsuite/tests/ghci/T11827/all.T b/testsuite/tests/ghci/T11827/all.T
index e2740f849c..81b9e23071 100644
--- a/testsuite/tests/ghci/T11827/all.T
+++ b/testsuite/tests/ghci/T11827/all.T
@@ -1,4 +1 @@
-test('T11827',
- [extra_clean(['A.hi', 'A.hi-boot', 'A.o', 'B.hi', 'B.o']),
- expect_broken(11827)],
- ghci_script, ['T11827.script'])
+test('T11827', [expect_broken(11827)], ghci_script, ['T11827.script'])
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 699802fe4b..33308335d7 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -5,46 +5,25 @@ test('ghcilink001',
run_command,
['$MAKE -s --no-print-directory ghcilink001'])
-test('ghcilink002',
- [unless(doing_ghci, skip), extra_clean(['dir002/*','dir002'])],
- run_command,
+test('ghcilink002', [unless(doing_ghci, skip)], run_command,
['$MAKE -s --no-print-directory ghcilink002'])
-test('ghcilink003',
- [
- unless(doing_ghci, skip),
- extra_clean(['dir003/*','dir003'])
- ],
- run_command,
+test('ghcilink003', [unless(doing_ghci, skip)], run_command,
['$MAKE -s --no-print-directory ghcilink003'])
test('ghcilink004',
[unless(doing_ghci, skip),
- when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)),
- extra_clean(['dir004/local.package.conf/*', 'dir004/*', 'dir004'])
- ],
- run_command,
- ['$MAKE -s --no-print-directory ghcilink004'])
+ when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))],
+ run_command, ['$MAKE -s --no-print-directory ghcilink004'])
-test('ghcilink005',
- [unless(doing_ghci, skip),
- extra_clean(['dir005/ghcilink005.package.conf/*', 'dir005/*','dir005'])
- ],
- run_command,
+test('ghcilink005', [unless(doing_ghci, skip)], run_command,
['$MAKE -s --no-print-directory ghcilink005'])
-test('ghcilink006',
- [
- unless(doing_ghci, skip),
- extra_clean(['dir006/ghcilink006.package.conf/*', 'dir006/*','dir006'])
- ],
- run_command,
+test('ghcilink006', [unless(doing_ghci, skip)], run_command,
['$MAKE -s --no-print-directory ghcilink006'])
test('T3333',
- [extra_clean(['T3333.o']),
- unless(doing_ghci, skip),
- unless(opsys('linux') or opsys('darwin') or ghc_dynamic(), expect_broken(3333))],
- run_command,
- ['$MAKE -s --no-print-directory T3333'])
-
+ [unless(doing_ghci, skip),
+ unless(opsys('linux') or opsys('darwin') or ghc_dynamic(),
+ expect_broken(3333))],
+ run_command, ['$MAKE -s --no-print-directory T3333'])
diff --git a/testsuite/tests/ghci/linking/dyn/all.T b/testsuite/tests/ghci/linking/dyn/all.T
index 94ebdc9e98..3ce075d61b 100644
--- a/testsuite/tests/ghci/linking/dyn/all.T
+++ b/testsuite/tests/ghci/linking/dyn/all.T
@@ -1,14 +1,10 @@
-test('load_short_name',
- [unless(doing_ghci, skip),
- extra_clean(['bin_short/*', 'bin_short'])],
- run_command,
+test('load_short_name', [unless(doing_ghci, skip)], run_command,
['$MAKE -s --no-print-directory load_short_name'])
test('T1407',
[unless(doing_ghci, skip),
- extra_clean(['T1407dir/libAS.*']),
- pre_cmd('$MAKE -s --no-print-directory compile_libT1407'),
- extra_hc_opts('-L"$PWD/T1407dir"')],
+ pre_cmd('$MAKE -s --no-print-directory compile_libT1407'),
+ extra_hc_opts('-L"$PWD/T1407dir"')],
run_command, ['$MAKE --no-print-directory -s T1407'])
test('T3242',
@@ -17,30 +13,22 @@ test('T3242',
['$MAKE -s --no-print-directory T3242'])
test('T10955',
- [unless(doing_ghci, skip),unless(opsys('mingw32'), skip),
- extra_clean(['bin_dep/*', 'bin_dep']),
- pre_cmd('$MAKE -s --no-print-directory compile_libAB_dep'),
- extra_hc_opts('-L. -L./bin_dep')],
+ [unless(doing_ghci, skip), unless(opsys('mingw32'), skip),
+ pre_cmd('$MAKE -s --no-print-directory compile_libAB_dep'),
+ extra_hc_opts('-L. -L./bin_dep')],
ghci_script, ['T10955.script'])
-test('T10955dyn',
- [extra_clean(['bin_dyn/*', 'bin_dyn'])],
- run_command,
+test('T10955dyn', [], run_command,
['$MAKE -s --no-print-directory compile_libAB_dyn'])
test('T10458',
[unless(doing_ghci, skip),
- extra_clean(['T10458dir/libAS.*']),
- pre_cmd('$MAKE -s --no-print-directory compile_libT10458'),
- extra_hc_opts('-L"$PWD/T10458dir" -lAS')],
+ pre_cmd('$MAKE -s --no-print-directory compile_libT10458'),
+ extra_hc_opts('-L"$PWD/T10458dir" -lAS')],
ghci_script, ['T10458.script'])
-test('T11072gcc',
- [unless(doing_ghci, skip), unless(opsys('mingw32'), skip), extra_clean(['bin_impl_gcc/*', 'bin_impl_gcc'])],
- run_command,
- ['$MAKE -s --no-print-directory compile_libAS_impl_gcc'])
+test('T11072gcc', [unless(doing_ghci, skip), unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory compile_libAS_impl_gcc'])
-test('T11072msvc',
- [unless(doing_ghci, skip), unless(opsys('mingw32'), skip), extra_clean(['bin_impl_msvc/*', 'bin_impl_msvc'])],
- run_command,
- ['$MAKE -s --no-print-directory compile_libAS_impl_msvc'])
+test('T11072msvc', [unless(doing_ghci, skip), unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory compile_libAS_impl_msvc'])
diff --git a/testsuite/tests/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T
index 30b228c55f..9a19b2f527 100644
--- a/testsuite/tests/ghci/prog001/prog001.T
+++ b/testsuite/tests/ghci/prog001/prog001.T
@@ -1,7 +1,6 @@
test('prog001',
- [extra_clean(['C.hs', 'D.hs', 'D.hi', 'D.o']),
- cmd_prefix('ghciWayFlags=' + config.ghci_way_flags),
+ [cmd_prefix('ghciWayFlags=' + config.ghci_way_flags),
when(arch('powerpc64') or arch('powerpc64le'),
- expect_broken_for(11259,['ghci-ext'])),
- unless(opsys('mingw32'),extra_ways(['ghci-ext']))],
+ expect_broken_for(11259, ['ghci-ext'])),
+ unless(opsys('mingw32'), extra_ways(['ghci-ext']))],
ghci_script, ['prog001.script'])
diff --git a/testsuite/tests/ghci/prog002/prog002.T b/testsuite/tests/ghci/prog002/prog002.T
index 1d6984b36f..9f066d474c 100644
--- a/testsuite/tests/ghci/prog002/prog002.T
+++ b/testsuite/tests/ghci/prog002/prog002.T
@@ -1,5 +1,2 @@
-test('prog002',
- [extra_clean(['A.hs', 'A.hi', 'A.o']),
- cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
+test('prog002', [cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
ghci_script, ['prog002.script'])
-
diff --git a/testsuite/tests/ghci/prog003/prog003.T b/testsuite/tests/ghci/prog003/prog003.T
index 92aadbac93..ee5939afb7 100644
--- a/testsuite/tests/ghci/prog003/prog003.T
+++ b/testsuite/tests/ghci/prog003/prog003.T
@@ -3,10 +3,6 @@
# for the sake of stability of the build bot we disable it for now.
# See Trac 11317.
test('prog003',
- [extra_clean(['D.hs', 'D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o',
- 'A', 'A.hi', 'A.o', 'a.out']),
- when(opsys('mingw32'), skip),
+ [when(opsys('mingw32'), skip),
cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
- ghci_script,
- ['prog003.script'])
-
+ ghci_script, ['prog003.script'])
diff --git a/testsuite/tests/ghci/prog004/prog004.T b/testsuite/tests/ghci/prog004/prog004.T
index 5d14125030..31ac04a100 100644
--- a/testsuite/tests/ghci/prog004/prog004.T
+++ b/testsuite/tests/ghci/prog004/prog004.T
@@ -3,7 +3,5 @@ def f(name, opts):
opts.skip = 1
setTestOpts(f)
-test('ghciprog004',
- extra_clean(['ctest.c', 'ctest.o']),
- run_command,
+test('ghciprog004', [], run_command,
['$MAKE -s --no-print-directory ghciprog004'])
diff --git a/testsuite/tests/ghci/prog005/prog005.T b/testsuite/tests/ghci/prog005/prog005.T
index 4c44c6b266..c6a7944915 100644
--- a/testsuite/tests/ghci/prog005/prog005.T
+++ b/testsuite/tests/ghci/prog005/prog005.T
@@ -1,2 +1 @@
-test('prog005', extra_clean(['A.hs']), ghci_script, ['prog005.script'])
-
+test('prog005', [], ghci_script, ['prog005.script'])
diff --git a/testsuite/tests/ghci/prog006/prog006.T b/testsuite/tests/ghci/prog006/prog006.T
index 04f3a7c61b..0d5ceb97ef 100644
--- a/testsuite/tests/ghci/prog006/prog006.T
+++ b/testsuite/tests/ghci/prog006/prog006.T
@@ -1 +1 @@
-test('prog006', extra_clean(['Boot.hs']), ghci_script, ['prog006.script'])
+test('prog006', [], ghci_script, ['prog006.script'])
diff --git a/testsuite/tests/ghci/prog009/ghci.prog009.T b/testsuite/tests/ghci/prog009/ghci.prog009.T
index f8b063407d..38aeea1f80 100644
--- a/testsuite/tests/ghci/prog009/ghci.prog009.T
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.T
@@ -1,4 +1 @@
-test('ghci.prog009',
- extra_clean(['A.hs']),
- ghci_script,
- ['ghci.prog009.script'])
+test('ghci.prog009', [], ghci_script, ['ghci.prog009.script'])
diff --git a/testsuite/tests/ghci/prog012/all.T b/testsuite/tests/ghci/prog012/all.T
index c4aa9caf07..9bd639c731 100644
--- a/testsuite/tests/ghci/prog012/all.T
+++ b/testsuite/tests/ghci/prog012/all.T
@@ -1,2 +1 @@
-test('prog012', extra_clean(['Bar.hs']), ghci_script, ['prog012.script'])
-
+test('prog012', [], ghci_script, ['prog012.script'])
diff --git a/testsuite/tests/ghci/prog014/prog014.T b/testsuite/tests/ghci/prog014/prog014.T
index 506c8b76e1..2b9d7c9b14 100644
--- a/testsuite/tests/ghci/prog014/prog014.T
+++ b/testsuite/tests/ghci/prog014/prog014.T
@@ -1,8 +1,4 @@
test('prog014',
- [ extra_run_opts('dummy.o')
- , pre_cmd('$MAKE -s --no-print-directory prog014')
- , clean_cmd('rm -f dummy.o')
- ],
- ghci_script,
- ['prog014.script'])
-
+ [extra_run_opts('dummy.o'),
+ pre_cmd('$MAKE -s --no-print-directory prog014')],
+ ghci_script, ['prog014.script'])
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index d448a12d9f..fd82c6fc8b 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -55,7 +55,7 @@ test('T9367',
test('ghci025', normal, ghci_script, ['ghci025.script'])
test('ghci026', normal, ghci_script, ['ghci026.script'])
-test('ghci027', extra_clean(['ghci027.hs']), ghci_script, ['ghci027.script'])
+test('ghci027', [], ghci_script, ['ghci027.script'])
test('ghci028', normal, ghci_script, ['ghci028.script'])
test('ghci029', normal, ghci_script, ['ghci029.script'])
test('ghci030', normal, ghci_script, ['ghci030.script'])
@@ -87,11 +87,8 @@ test('ghci054', normal, ghci_script, ['ghci054.script'])
test('ghci055', combined_output, ghci_script, ['ghci055.script'])
test('ghci056',
- [
- pre_cmd('$MAKE -s --no-print-directory ghci056_setup'),
- extra_run_opts('ghci056_c.o'),
- extra_clean(['ghci056_c.o'])
- ],
+ [pre_cmd('$MAKE -s --no-print-directory ghci056_setup'),
+ extra_run_opts('ghci056_c.o')],
ghci_script, ['ghci056.script'])
test('ghci057', normal, ghci_script, ['ghci057.script'])
@@ -103,10 +100,7 @@ test('ghci062', when(config.have_ext_interp, extra_ways(['ghci-ext'])),
test('T2452', normal, ghci_script, ['T2452.script'])
test('T2766', normal, ghci_script, ['T2766.script'])
-test('T1914',
- extra_clean(['T1914A.hs', 'T1914B.hs']),
- ghci_script,
- ['T1914.script'])
+test('T1914', [], ghci_script, ['T1914.script'])
test('T2182ghci', normal, ghci_script, ['T2182ghci.script'])
test('T2182ghci2', [extra_hc_opts("-XNoImplicitPrelude")], ghci_script, ['T2182ghci2.script'])
@@ -137,33 +131,19 @@ test('T5979',
normalise_slashes,
normalise_version("transformers")],
ghci_script, ['T5979.script'])
-test('T5975a',
- [pre_cmd('touch föøbàr1.hs'),
- clean_cmd('rm -f föøbàr1.hs')],
- ghci_script, ['T5975a.script'])
-test('T5975b',
- [pre_cmd('touch föøbàr2.hs'),
- clean_cmd('rm -f föøbàr2.hs'),
- extra_hc_opts('föøbàr2.hs')],
+test('T5975a', [pre_cmd('touch föøbàr1.hs')], ghci_script, ['T5975a.script'])
+test('T5975b', [pre_cmd('touch föøbàr2.hs'), extra_hc_opts('föøbàr2.hs')],
ghci_script, ['T5975b.script'])
test('T6027ghci', normal, ghci_script, ['T6027ghci.script'])
test('T6007', normal, ghci_script, ['T6007.script'])
test('T6091', normal, ghci_script, ['T6091.script'])
-test('T6106',
- [extra_clean(['T6106.hs',
- 'T6106_preproc.hi', 'T6106_preproc.o',
- 'T6106_preproc', 'T6106_preproc.exe']),
- pre_cmd('$MAKE -s --no-print-directory T6106_prep')],
- ghci_script,
- ['T6106.script'])
+test('T6106', [pre_cmd('$MAKE -s --no-print-directory T6106_prep')],
+ ghci_script, ['T6106.script'])
test('T6105', normal, ghci_script, ['T6105.script'])
test('T7117', normal, ghci_script, ['T7117.script'])
-test('ghci058',
- [extra_clean(['Ghci058.hs', 'Ghci058.hi', 'Ghci058.o']),
- cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
- ghci_script,
- ['ghci058.script'])
+test('ghci058', [cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)],
+ ghci_script, ['ghci058.script'])
test('T7587', normal, ghci_script, ['T7587.script'])
test('T7688', normal, ghci_script, ['T7688.script'])
test('T7627', normal, ghci_script, ['T7627.script'])
@@ -213,13 +193,9 @@ test('T9762',
],
ghci_script, ['T9762.script'])
test('T9881', normal, ghci_script, ['T9881.script'])
-test('T9878',
- [extra_clean(['T9878.hi','T9878.o'])],
- ghci_script, ['T9878.script'])
-test('T9878b',
- [ extra_run_opts('-fobject-code'),
- extra_clean(['T9878b.hi','T9878b.o'])],
- ghci_script, ['T9878b.script'])
+test('T9878', [], ghci_script, ['T9878.script'])
+test('T9878b', [extra_run_opts('-fobject-code')], ghci_script,
+ ['T9878b.script'])
test('T10018', normal, ghci_script, ['T10018.script'])
test('T10122', normal, ghci_script, ['T10122.script'])
@@ -236,11 +212,7 @@ test('T10501', normal, ghci_script, ['T10501.script'])
test('T10508', normal, ghci_script, ['T10508.script'])
test('T10520', normal, ghci_script, ['T10520.script'])
test('T10663', normal, ghci_script, ['T10663.script'])
-test('T10989',
- [
- extra_clean(['dummy.hs', 'dummy.lhs', 'dummy.tags'])
- ],
- ghci_script, ['T10989.script'])
+test('T10989', [], ghci_script, ['T10989.script'])
test('T11098', normal, ghci_script, ['T11098.script'])
test('T8316', expect_broken(8316), ghci_script, ['T8316.script'])
test('T11252', normal, ghci_script, ['T11252.script'])
diff --git a/testsuite/tests/haddock/haddock_examples/test.T b/testsuite/tests/haddock/haddock_examples/test.T
index 43aa20ebb8..25cf176997 100644
--- a/testsuite/tests/haddock/haddock_examples/test.T
+++ b/testsuite/tests/haddock/haddock_examples/test.T
@@ -1,6 +1,3 @@
-test('haddock.Test',
- [omit_ways(prof_ways),
- extra_clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o',
- 'Visible.hi', 'Visible.o'])],
- multimod_compile,
- ['Test Hidden Visible', '-XRankNTypes -XExistentialQuantification -haddock -ddump-parsed'])
+test('haddock.Test', [omit_ways(prof_ways)], multimod_compile,
+ ['Test Hidden Visible',
+ '-XRankNTypes -XExistentialQuantification -haddock -ddump-parsed'])
diff --git a/testsuite/tests/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index 23628b2ea4..03dd69a8d4 100644
--- a/testsuite/tests/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
@@ -1,44 +1,18 @@
-test('hsc2hs001',
- extra_clean(['hsc2hs001.hs', 'hsc2hs001_hsc_make.c']),
- run_command,
- ['$MAKE -s --no-print-directory hsc2hs001'])
-
-test('hsc2hs002',
- extra_clean(['hsc2hs002.hs', 'hsc2hs002_hsc_make.c']),
- run_command,
- ['$MAKE -s --no-print-directory hsc2hs002'])
-
-test('hsc2hs003',
- extra_clean(['hsc2hs003.hs', 'hsc2hs003_hsc_make.c']),
- run_command,
- ['$MAKE -s --no-print-directory hsc2hs003'])
-
-test('hsc2hs004',
- extra_clean(['hsc2hs004.hs', 'hsc2hs004_hsc_make.c']),
- run_command,
- ['$MAKE -s --no-print-directory hsc2hs004'])
-
-
-test('T3837',
- [extra_clean(['T3837.hs', 'T3837_hsc_make.c'])],
- run_command,
- ['$MAKE -s --no-print-directory T3837'])
-
-test('T4340',
- [extra_clean(['T4340.hs', 'T4340_hsc_make.c',
- 'T4340_hsc.c', 'T4340_hsc.h'])],
- run_command,
- ['$MAKE -s --no-print-directory T4340'])
-
-test('T10272',
- [extra_clean(['T10272.hs', 'T10272_hsc_make.c'])],
- run_command,
- ['$MAKE -s --no-print-directory T10272'])
-
-test('T12504',
- [extra_clean(['T12504/path/to/T12504.hs']),
- extra_files(['T12504']),
- ignore_stdout],
- run_command,
+test('hsc2hs001', [], run_command, ['$MAKE -s --no-print-directory hsc2hs001'])
+
+test('hsc2hs002', [], run_command, ['$MAKE -s --no-print-directory hsc2hs002'])
+
+test('hsc2hs003', [], run_command, ['$MAKE -s --no-print-directory hsc2hs003'])
+
+test('hsc2hs004', [], run_command, ['$MAKE -s --no-print-directory hsc2hs004'])
+
+
+test('T3837', [], run_command, ['$MAKE -s --no-print-directory T3837'])
+
+test('T4340', [], run_command, ['$MAKE -s --no-print-directory T4340'])
+
+test('T10272', [], run_command, ['$MAKE -s --no-print-directory T10272'])
+
+test('T12504', [extra_files(['T12504']), ignore_stdout], run_command,
['$MAKE -s --no-print-directory T12504'])
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index eb71a2866e..26e24ada34 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -27,19 +27,10 @@ test('RelaxedExamples', normal, compile, [''])
test('NonLinearLHS', normal, compile, [''])
test('ind1', normal, compile, [''])
-test('ind2',
- extra_clean(['Ind2_help.hi', 'Ind2_help.o']),
- multimod_compile,
- ['ind2', '-v0'])
-test('impexp',
- extra_clean(['Exp.hi', 'Exp.o', 'Imp.hi', 'Imp.o']),
- multimod_compile,
- ['Imp', '-w -no-hs-main -c'])
-
-test('ATLoop',
- extra_clean(['ATLoop_help.o','ATLoop_help.hi']),
- multimod_compile,
- ['ATLoop.hs','-v0'])
+test('ind2', [], multimod_compile, ['ind2', '-v0'])
+test('impexp', [], multimod_compile, ['Imp', '-w -no-hs-main -c'])
+
+test('ATLoop', [], multimod_compile, ['ATLoop.hs', '-v0'])
test('Deriving', normal, compile, [''])
test('DerivingNewType', normal, compile, [''])
@@ -48,10 +39,7 @@ test('Records', normal, compile, [''])
# The point about this test is that it compiles NewTyCo1 and NewTyCo2
# *separately*
#
-test('NewTyCo',
- extra_clean(['NewTyCo1.o', 'NewTyCo1.hi', 'NewTyCo2.o', 'NewTyCo2.hi']),
- run_command,
- ['$MAKE -s --no-print-directory NewTyCo'])
+test('NewTyCo', [], run_command, ['$MAKE -s --no-print-directory NewTyCo'])
test('Infix', normal, compile, [''])
test('Kind', normal, compile, [''])
@@ -180,10 +168,7 @@ test('HO', normal, compile, [''])
# The point about this test is that it compiles the two T5955
# modules *separately*
-test('T5955',
- extra_clean(['T5955.o', 'T5955.hi', 'T5955a.o', 'T5955a.hi']),
- run_command,
- ['$MAKE -s --no-print-directory T5955'])
+test('T5955', [], run_command, ['$MAKE -s --no-print-directory T5955'])
test('T6152',
normal,
@@ -231,10 +216,8 @@ test('T8500',
test('T8018', normal, compile, [''])
test('T8020', normal, compile, [''])
-test('ClosedFam1', extra_clean(['ClosedFam1.o-boot', 'ClosedFam1.hi-boot', 'ClosedFam1a.o', 'ClosedFam1a.hi']),
- multimod_compile, ['ClosedFam1', '-v0'])
-test('ClosedFam2', extra_clean(['ClosedFam2.o-boot', 'ClosedFam2.hi-boot', 'ClosedFam2a.o', 'ClosedFam2a.hi']),
- multimod_compile, ['ClosedFam2', '-v0'])
+test('ClosedFam1', [], multimod_compile, ['ClosedFam1', '-v0'])
+test('ClosedFam2', [], multimod_compile, ['ClosedFam2', '-v0'])
test('T8651', normal, compile, [''])
test('T8889', normal, compile, [''])
test('T8913', normal, compile, [''])
@@ -247,10 +230,7 @@ test('Sock', normal, compile, [''])
test('T9211', normal, compile, [''])
test('T9747', normal, compile, [''])
test('T9582', normal, compile, [''])
-test('T9840',
- extra_clean(['T9840.hi-boot', 'T9840.o-boot', 'T9840a.hi', 'T9840a.o']),
- multimod_compile,
- ['T9840', '-v0'])
+test('T9840', [], multimod_compile, ['T9840', '-v0'])
test('T9090', normal, compile, [''])
test('T10020', normal, compile, [''])
test('T10079', normal, compile, [''])
diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T
index 8c243440dc..4e3927797c 100644
--- a/testsuite/tests/indexed-types/should_fail/all.T
+++ b/testsuite/tests/indexed-types/should_fail/all.T
@@ -29,12 +29,7 @@ test('NonLinearSigErr', normal, compile, [''])
test('GADTwrong1', normal, compile_fail, [''])
-test('Over',
- extra_clean(['OverA.hi', 'OverA.o',
- 'OverB.hi', 'OverB.o',
- 'OverC.hi', 'OverC.o']),
- multimod_compile_fail,
- ['OverD', '-no-hs-main -c -v0'])
+test('Over', [], multimod_compile_fail, ['OverD', '-no-hs-main -c -v0'])
test('SkolemOccursLoop', expect_fail, compile_fail, [''])
@@ -85,10 +80,7 @@ test('Overlap11', normal, compile_fail, [''])
test('Overlap15', normal, compile_fail, [''])
test('T7194', normal, compile_fail, [''])
test('T7354', normal, compile_fail, [''])
-test('T7354a',
- extra_clean(['T7354b.o', 'T7354b.hi']),
- run_command,
- ['$MAKE -s --no-print-directory T7354a'])
+test('T7354a', [], run_command, ['$MAKE -s --no-print-directory T7354a'])
test('T7536', normal, compile_fail, [''])
test('T7729', normal, compile_fail, [''])
@@ -100,14 +92,10 @@ test('T7967', normal, compile_fail, [''])
test('T7938', normal, compile_fail, [''])
-test('ClosedFam3', extra_clean(['ClosedFam3.o-boot', 'ClosedFam3.hi-boot', 'ClosedFam3a.hi', 'ClosedFam3a.o']),
- multimod_compile_fail, ['ClosedFam3', '-v0'])
+test('ClosedFam3', [], multimod_compile_fail, ['ClosedFam3', '-v0'])
test('ClosedFam4', normal, compile_fail, [''])
test('T8155', normal, compile_fail, [''])
-test('T8227',
- extra_clean(['T8227a.o', 'T8227a.hi']),
- run_command,
- ['$MAKE -s --no-print-directory T8227'])
+test('T8227', [], run_command, ['$MAKE -s --no-print-directory T8227'])
test('T8129',
normal,
run_command,
diff --git a/testsuite/tests/layout/all.T b/testsuite/tests/layout/all.T
index ddd53ee64f..cde69bfa1b 100644
--- a/testsuite/tests/layout/all.T
+++ b/testsuite/tests/layout/all.T
@@ -1,47 +1,19 @@
-test('layout001',
- extra_clean(['layout001.hi', 'layout001.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout001'])
-
-test('layout002',
- extra_clean(['layout002.hi', 'layout002.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout002'])
-
-test('layout003',
- extra_clean(['layout003.hi', 'layout003.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout003'])
-
-test('layout004',
- extra_clean(['layout004.hi', 'layout004.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout004'])
-
-test('layout005',
- extra_clean(['layout005.hi', 'layout005.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout005'])
-
-test('layout006',
- extra_clean(['layout006.hi', 'layout006.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout006'])
-
-test('layout007',
- [req_interp,
- extra_clean(['layout007.hi', 'layout007.o'])],
- run_command,
- ['$MAKE -s --no-print-directory layout007'])
+test('layout001', [], run_command, ['$MAKE -s --no-print-directory layout001'])
+
+test('layout002', [], run_command, ['$MAKE -s --no-print-directory layout002'])
+
+test('layout003', [], run_command, ['$MAKE -s --no-print-directory layout003'])
+
+test('layout004', [], run_command, ['$MAKE -s --no-print-directory layout004'])
-test('layout008',
- extra_clean(['layout008.hi', 'layout008.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout008'])
+test('layout005', [], run_command, ['$MAKE -s --no-print-directory layout005'])
+
+test('layout006', [], run_command, ['$MAKE -s --no-print-directory layout006'])
+
+test('layout007', [req_interp], run_command,
+ ['$MAKE -s --no-print-directory layout007'])
-test('layout009',
- extra_clean(['layout009.hi', 'layout009.o']),
- run_command,
- ['$MAKE -s --no-print-directory layout009'])
+test('layout008', [], run_command, ['$MAKE -s --no-print-directory layout008'])
+test('layout009', [], run_command, ['$MAKE -s --no-print-directory layout009'])
diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T
index 327f5778f4..ca785f9823 100644
--- a/testsuite/tests/lib/integer/all.T
+++ b/testsuite/tests/lib/integer/all.T
@@ -4,16 +4,10 @@ test('integerConversions', normal, compile_and_run, [''])
test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
test('plusMinusInteger', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
test('integerConstantFolding',
- [extra_clean(['integerConstantFolding.simpl']),
- when(compiler_debugged(), expect_broken(11006))],
- run_command,
+ [when(compiler_debugged(), expect_broken(11006))], run_command,
['$MAKE -s --no-print-directory integerConstantFolding'])
-test('fromToInteger',
- extra_clean(['fromToInteger.simpl']),
- run_command,
+test('fromToInteger', [], run_command,
['$MAKE -s --no-print-directory fromToInteger'])
-test('IntegerConversionRules',
- extra_clean(['IntegerConversionRules.simpl']),
- run_command,
+test('IntegerConversionRules', [], run_command,
['$MAKE -s --no-print-directory IntegerConversionRules'])
test('gcdInteger', normal, compile_and_run, [''])
diff --git a/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T b/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
index 9d5fc75a5b..ca6bc0a24f 100644
--- a/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
+++ b/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
@@ -13,7 +13,5 @@ setTestOpts(f)
# Please refer to https://ghc.haskell.org/trac/ghc/ticket/5019
# for the subsections_via_symbols.stderr
-test('subsections_via_symbols',
- [extra_clean(['SubsectionsViaSymbols.hi', 'SubsectionsViaSymbols.o', 'SymbolsViaSections_stub.h', 'subsections_via_symbols', 'SubsectionsViaSymbols.a', 'SymbolsViaSections.hi', 'SymbolsViaSections.o', 'subsections_via_symbols.o']),
- only_darwin],
- run_command, ['$MAKE -s --no-print-directory subsections_via_symbols_test'])
+test('subsections_via_symbols', [only_darwin], run_command,
+ ['$MAKE -s --no-print-directory subsections_via_symbols_test'])
diff --git a/testsuite/tests/module/all.T b/testsuite/tests/module/all.T
index c7097b2dfc..8285c6c64d 100644
--- a/testsuite/tests/module/all.T
+++ b/testsuite/tests/module/all.T
@@ -129,13 +129,9 @@ test('mod98', normal, compile_fail, [''])
test('mod99', normal, compile, [''])
test('mod100', normal, compile, [''])
-test('mod101',
- extra_clean(['Mod101_AuxA.hi', 'Mod101_AuxA.o', 'Mod101_AuxB.hi', 'Mod101_AuxB.o']),
- multimod_compile_fail, ['mod101', '-v0'])
+test('mod101', [], multimod_compile_fail, ['mod101', '-v0'])
-test('mod102',
- extra_clean(['Mod102_AuxA.hi', 'Mod102_AuxA.o', 'Mod102_AuxB.hi', 'Mod102_AuxB.o']),
- multimod_compile_fail, ['mod102', '-v0'])
+test('mod102', [], multimod_compile_fail, ['mod102', '-v0'])
test('mod103', normal, compile, [''])
test('mod104', normal, compile, [''])
@@ -148,111 +144,67 @@ test('mod110', normal, compile_fail, [''])
test('mod111', normal, compile, [''])
test('mod112', normal, compile, [''])
test('mod113', normal, compile, [''])
-test('mod114', extra_clean(['Mod114_Help.hi', 'Mod114_Help.o']),
- multimod_compile_fail, ['mod114', '-v0'])
+test('mod114', [], multimod_compile_fail, ['mod114', '-v0'])
-test('mod115',
- extra_clean(['Mod115_A.hi', 'Mod115_A.o', 'Mod115_B.hi', 'Mod115_B.o']),
- multimod_compile, ['mod115', '-v0'])
+test('mod115', [], multimod_compile, ['mod115', '-v0'])
test('mod116', normal, compile_fail, [''])
-test('mod117',
- extra_clean(['Mod117_A.hi', 'Mod117_A.o', 'Mod117_B.hi', 'Mod117_B.o']),
- multimod_compile, ['mod117', '-v0'])
+test('mod117', [], multimod_compile, ['mod117', '-v0'])
-test('mod118',
- extra_clean(['Mod118_A.hi', 'Mod118_A.o', 'Mod118_B.hi', 'Mod118_B.o']),
- multimod_compile, ['mod118', '-v0'])
+test('mod118', [], multimod_compile, ['mod118', '-v0'])
-test('mod119',
- extra_clean(['Mod119_A.hi', 'Mod119_A.o', 'Mod119_B.hi', 'Mod119_B.o']),
- multimod_compile, ['mod119', '-v0'])
+test('mod119', [], multimod_compile, ['mod119', '-v0'])
-test('mod120',
- extra_clean(['Mod120_A.hi', 'Mod120_A.o']),
- multimod_compile_fail, ['mod120', '-v0'])
+test('mod120', [], multimod_compile_fail, ['mod120', '-v0'])
-test('mod121',
- extra_clean(['Mod121_A.hi', 'Mod121_A.o']),
- multimod_compile_fail, ['mod121', '-v0'])
+test('mod121', [], multimod_compile_fail, ['mod121', '-v0'])
-test('mod122',
- extra_clean(['Mod122_A.hi', 'Mod122_A.o']),
- multimod_compile_fail, ['mod122', '-v0'])
+test('mod122', [], multimod_compile_fail, ['mod122', '-v0'])
-test('mod123',
- extra_clean(['Mod123_A.hi', 'Mod123_A.o']),
- multimod_compile_fail, ['mod123', '-v0'])
+test('mod123', [], multimod_compile_fail, ['mod123', '-v0'])
-test('mod124',
- extra_clean(['Mod124_A.hi', 'Mod124_A.o']),
- multimod_compile_fail, ['mod124', '-v0'])
+test('mod124', [], multimod_compile_fail, ['mod124', '-v0'])
-test('mod125',
- extra_clean(['Mod125_A.hi', 'Mod125_A.o']),
- multimod_compile_fail, ['mod125', '-v0'])
+test('mod125', [], multimod_compile_fail, ['mod125', '-v0'])
-test('mod126',
- extra_clean(['Mod126_A.hi', 'Mod126_A.o']),
- multimod_compile_fail, ['mod126', '-v0'])
+test('mod126', [], multimod_compile_fail, ['mod126', '-v0'])
-test('mod127',
- extra_clean(['Mod127_A.hi', 'Mod127_A.o']),
- multimod_compile_fail, ['mod127', '-v0'])
+test('mod127', [], multimod_compile_fail, ['mod127', '-v0'])
-test('mod128',
- extra_clean(['Mod128_A.hi', 'Mod128_A.o']) ,
- multimod_compile, ['mod128', '-v0'])
+test('mod128', [], multimod_compile, ['mod128', '-v0'])
test('mod129', normal, compile, [''])
test('mod130', normal, compile_fail, [''])
-test('mod131',
- extra_clean(['Mod131_A.hi', 'Mod131_A.o', 'Mod131_B.hi', 'Mod131_B.o']),
- multimod_compile_fail, ['mod131', '-v0'])
+test('mod131', [], multimod_compile_fail, ['mod131', '-v0'])
-test('mod132',
- extra_clean(['Mod132_A.hi', 'Mod132_A.o', 'Mod132_B.hi', 'Mod132_B.o']),
- multimod_compile_fail, ['mod132', '-v0'])
+test('mod132', [], multimod_compile_fail, ['mod132', '-v0'])
test('mod133', reqlib('mtl'), compile, [''])
test('mod134', normal, compile_fail, [''])
test('mod135', normal, compile_fail, [''])
-test('mod136', extra_clean(['Mod136_A.hi', 'Mod136_A.o']),
- multimod_compile_fail, ['mod136', '-v0'])
+test('mod136', [], multimod_compile_fail, ['mod136', '-v0'])
-test('mod137', extra_clean(['Mod137_A.hi', 'Mod137_A.o']),
- multimod_compile, ['mod137', '-v0'])
+test('mod137', [], multimod_compile, ['mod137', '-v0'])
-test('mod138', extra_clean(['Mod138_A.hi', 'Mod138_A.o']),
- multimod_compile_fail, ['mod138', '-v0'])
+test('mod138', [], multimod_compile_fail, ['mod138', '-v0'])
-test('mod139', extra_clean(['Mod139_A.hi', 'Mod139_A.o', 'Mod139_B.hi', 'Mod139_B.o']),
- multimod_compile, ['mod139', '-v0'])
+test('mod139', [], multimod_compile, ['mod139', '-v0'])
-test('mod140', extra_clean(['Mod140_A.hi', 'Mod140_A.o']),
- multimod_compile, ['mod140', '-v0'])
+test('mod140', [], multimod_compile, ['mod140', '-v0'])
-test('mod141', extra_clean(['Mod141_A.hi', 'Mod141_A.o']),
- multimod_compile, ['mod141', '-v0'])
+test('mod141', [], multimod_compile, ['mod141', '-v0'])
-test('mod142', extra_clean(['Mod142_A.hi', 'Mod142_A.o']),
- multimod_compile_fail, ['mod142', '-v0'])
+test('mod142', [], multimod_compile_fail, ['mod142', '-v0'])
-test('mod143', extra_clean(['Mod143_A.hi', 'Mod143_A.o']),
- multimod_compile_fail, ['mod143', '-v0'])
+test('mod143', [], multimod_compile_fail, ['mod143', '-v0'])
-test('mod144', extra_clean(['Mod144_A.hi', 'Mod144_A.o']),
- run_command, ['$MAKE -s --no-print-directory mod144'])
+test('mod144', [], run_command, ['$MAKE -s --no-print-directory mod144'])
-test('mod145', extra_clean(['Mod145_A.hi', 'Mod145_A.o']),
- multimod_compile_fail, ['mod145', '-v0'])
+test('mod145', [], multimod_compile_fail, ['mod145', '-v0'])
-test('mod146',
- extra_clean(['Mod145_A.mod146_hi', 'Mod145_A.mod146_o', 'mod146.mod146_o', 'mod146.mod146_hi']),
- run_command, ['$MAKE -s --no-print-directory mod146'])
+test('mod146', [], run_command, ['$MAKE -s --no-print-directory mod146'])
-test('mod147', extra_clean(['Mod147_A.hi', 'Mod147_A.o']),
- multimod_compile_fail, ['mod147', '-v0'])
+test('mod147', [], multimod_compile_fail, ['mod147', '-v0'])
test('mod148', normal, compile, [''])
test('mod149', normal, compile, [''])
@@ -263,76 +215,53 @@ test('mod153', normal, compile_fail, [''])
test('mod154', normal, compile, [''])
test('mod155', normal, compile_fail, [''])
test('mod156', normal, compile, [''])
-test('mod157',
- extra_clean(['Mod157_A.hi', 'Mod157_A.o', 'Mod157_B.hi', 'Mod157_B.o',
- 'Mod157_C.hi', 'Mod157_C.o', 'Mod157_D.hi', 'Mod157_D.o']),
- multimod_compile, ['mod157', '-v0'])
-
-test('mod158',
- extra_clean(['Mod157_A.mod158_hi', 'Mod157_A.mod158_o', 'Mod157_B.mod158_hi', 'Mod157_B.mod158_o',
- 'Mod157_C.mod158_hi', 'Mod157_C.mod158_o', 'Mod157_D.mod158_hi', 'Mod157_D.mod158_o']),
- run_command, ['$MAKE -s --no-print-directory mod158'])
-
-test('mod159',
- extra_clean(['Mod159_A.hi', 'Mod159_A.o', 'Mod159_B.hi', 'Mod159_B.o',
- 'Mod159_C.hi', 'Mod159_C.o', 'Mod159_D.hi', 'Mod159_D.o']),
- multimod_compile, ['mod159', '-v0'])
-
-test('mod160',
- extra_clean(['Mod159_A.mod160_hi', 'Mod159_A.mod160_o', 'Mod159_B.mod160_hi', 'Mod159_B.mod160_o',
- 'Mod159_C.mod160_hi', 'Mod159_C.mod160_o', 'Mod159_D.mod160_hi', 'Mod159_D.mod160_o']),
- run_command, ['$MAKE -s --no-print-directory mod160'])
+test('mod157', [], multimod_compile, ['mod157', '-v0'])
+
+test('mod158', [], run_command, ['$MAKE -s --no-print-directory mod158'])
+
+test('mod159', [], multimod_compile, ['mod159', '-v0'])
+
+test('mod160', [], run_command, ['$MAKE -s --no-print-directory mod160'])
test('mod161', normal, compile_fail, [''])
-test('mod162', extra_clean(['Mod162_A.hi', 'Mod162_A.o']),
- multimod_compile, ['mod162', '-v0'])
+test('mod162', [], multimod_compile, ['mod162', '-v0'])
-test('mod163', extra_clean(['Mod163_A.hi', 'Mod163_A.o']),
- multimod_compile, ['mod163', '-v0'])
+test('mod163', [], multimod_compile, ['mod163', '-v0'])
-test('mod164', extra_clean(['Mod164_A.hi', 'Mod164_A.o', 'Mod164_B.hi', 'Mod164_B.o']),
- multimod_compile_fail, ['mod164', '-v0'])
+test('mod164', [], multimod_compile_fail, ['mod164', '-v0'])
-test('mod165', extra_clean(['Mod164_A.mod165_hi', 'Mod164_A.mod165_o', 'Mod164_B.mod165_hi', 'Mod164_B.mod165_o']),
- run_command, ['$MAKE -s --no-print-directory mod165'])
+test('mod165', [], run_command, ['$MAKE -s --no-print-directory mod165'])
-test('mod166', extra_clean(['Mod164_A.mod166_hi', 'Mod164_A.mod166_o', 'Mod164_B.mod166_hi', 'Mod164_B.mod166_o', 'mod166.mod166_o', 'mod166.mod166_hi']),
- run_command, ['$MAKE -s --no-print-directory mod166 MAKELEVEL='])
+test('mod166', [], run_command,
+ ['$MAKE -s --no-print-directory mod166 MAKELEVEL='])
-test('mod167', extra_clean(['Mod164_A.mod167_hi', 'Mod164_A.mod167_o', 'Mod164_B.mod167_hi', 'Mod164_B.mod167_o', 'mod167.mod167_o', 'mod167.mod167_hi']),
- run_command, ['$MAKE -s --no-print-directory mod167 MAKELEVEL='])
+test('mod167', [], run_command,
+ ['$MAKE -s --no-print-directory mod167 MAKELEVEL='])
test('mod168', normal, compile, [''])
test('mod169', normal, compile, [''])
-test('mod170', extra_clean(['Mod170_A.hi', 'Mod170_A.o']),
- multimod_compile, ['mod170', '-v0'])
+test('mod170', [], multimod_compile, ['mod170', '-v0'])
-test('mod171', extra_clean(['Mod171_A.hi', 'Mod171_A.o', 'Mod171_B.hi', 'Mod171_B.o']),
- multimod_compile, ['mod171', '-v0 -Wall'])
+test('mod171', [], multimod_compile, ['mod171', '-v0 -Wall'])
-test('mod172', extra_clean(['Mod172_B.hi', 'Mod172_B.o', 'Mod172_C.hi', 'Mod172_C.o']),
- multimod_compile, ['mod172', '-v0'])
+test('mod172', [], multimod_compile, ['mod172', '-v0'])
-test('mod173', extra_clean(['Mod173_Aux.hi', 'Mod173_Aux.o']),
- multimod_compile, ['mod173', '-v0'])
+test('mod173', [], multimod_compile, ['mod173', '-v0'])
# mod174 has been deleted
# mod175 is a sub-directory
test('mod176', normal, compile, ['-fwarn-unused-imports'])
test('mod177', normal, compile, ['-fwarn-unused-imports'])
-test('mod178', extra_clean(['Mod178_2.hi', 'Mod178_2.o']),
- multimod_compile_fail, ['mod178', '-v0'])
+test('mod178', [], multimod_compile_fail, ['mod178', '-v0'])
-test('mod179', extra_clean(['Mod179_A.hi', 'Mod179_A.o']),
- multimod_compile, ['mod179', '-v0'])
+test('mod179', [], multimod_compile, ['mod179', '-v0'])
-test('mod180', extra_clean(['Mod180_A.hi', 'Mod180_A.o', 'Mod180_B.hi', 'Mod180_B.o']),
- multimod_compile_fail, ['mod180', '-v0'])
+test('mod180', [], multimod_compile_fail, ['mod180', '-v0'])
test('T1148', normal, compile, [''])
test('T1074', reqlib('mtl'), compile, [''])
@@ -345,8 +274,7 @@ test('T3776', normal, compile, [''])
test('T7765', normal, compile_fail, [''])
test('T9061', normal, compile, [''])
test('T9997', normal, compile, [''])
-test('T10233', extra_clean(['T01233a.hi', 'T01233a.o']),
- multimod_compile, ['T10233', '-v0'])
+test('T10233', [], multimod_compile, ['T10233', '-v0'])
test('T11432', normal, compile_fail, [''])
test('T11432a', normal, compile_fail, [''])
test('T12026', normal, compile_fail, [''])
diff --git a/testsuite/tests/module/base01/all.T b/testsuite/tests/module/base01/all.T
index 72ae80f8ae..fdcea53d19 100644
--- a/testsuite/tests/module/base01/all.T
+++ b/testsuite/tests/module/base01/all.T
@@ -1,6 +1,2 @@
-test('base01',
- [normalise_slashes,
- clean_cmd('$MAKE -s clean')],
- run_command,
+test('base01', [normalise_slashes], run_command,
['$MAKE -s base01 --no-print-directory'])
-
diff --git a/testsuite/tests/module/mod175/all.T b/testsuite/tests/module/mod175/all.T
index 798147508f..5e03f15618 100644
--- a/testsuite/tests/module/mod175/all.T
+++ b/testsuite/tests/module/mod175/all.T
@@ -1,5 +1 @@
-test('mod175',
- clean_cmd('$MAKE -s clean'),
- run_command,
- ['$MAKE -s --no-print-directory mod175'])
-
+test('mod175', [], run_command, ['$MAKE -s --no-print-directory mod175'])
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index a7c7c84d1c..c0c4fe915c 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -49,10 +49,7 @@ test('mul2', normal, compile_and_run, ['-fobject-code'])
test('quotRem2', normal, compile_and_run, ['-fobject-code'])
test('T5863', normal, compile_and_run, [''])
-test('T7014',
- extra_clean(['T7014.simpl']),
- run_command,
- ['$MAKE -s --no-print-directory T7014'])
+test('T7014', [], run_command, ['$MAKE -s --no-print-directory T7014'])
test('T7233', normal, compile_and_run, [''])
test('NumDecimals', normal, compile_and_run, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_compile/all.T b/testsuite/tests/overloadedrecflds/should_compile/all.T
index 264fa115e4..6146615045 100644
--- a/testsuite/tests/overloadedrecflds/should_compile/all.T
+++ b/testsuite/tests/overloadedrecflds/should_compile/all.T
@@ -1,2 +1,2 @@
-test('T11173', extra_clean(['T11173a.hi', 'T11173a.o']), multimod_compile, ['T11173', '-v0'])
+test('T11173', [], multimod_compile, ['T11173', '-v0'])
test('T12609', normal, compile, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_fail/all.T b/testsuite/tests/overloadedrecflds/should_fail/all.T
index b7d1bff336..95a2d9b81e 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/all.T
+++ b/testsuite/tests/overloadedrecflds/should_fail/all.T
@@ -1,33 +1,24 @@
test('overloadedrecfldsfail01', normal, compile_fail, [''])
test('overloadedrecfldsfail02', normal, compile_fail, [''])
test('overloadedrecfldsfail03', normal, compile_fail, [''])
-test('overloadedrecfldsfail04',
- extra_clean(['OverloadedRecFldsFail04_A.hi', 'OverloadedRecFldsFail04_A.o']),
- multimod_compile_fail, ['overloadedrecfldsfail04', ''])
+test('overloadedrecfldsfail04', [], multimod_compile_fail,
+ ['overloadedrecfldsfail04', ''])
test('overloadedrecfldsfail05', normal, compile_fail, [''])
-test('overloadedrecfldsfail06',
- extra_clean(['OverloadedRecFldsFail06_A.hi', 'OverloadedRecFldsFail06_A.o']),
- multimod_compile_fail, ['overloadedrecfldsfail06', ''])
+test('overloadedrecfldsfail06', [], multimod_compile_fail,
+ ['overloadedrecfldsfail06', ''])
test('overloadedrecfldsfail07', normal, compile_fail, [''])
test('overloadedrecfldsfail08', normal, compile_fail, [''])
test('overloadedrecfldsfail09', normal, compile_fail, [''])
-test('overloadedrecfldsfail10',
- extra_clean([ 'OverloadedRecFldsFail10_A.hi', 'OverloadedRecFldsFail10_A.o'
- , 'OverloadedRecFldsFail10_B.hi', 'OverloadedRecFldsFail10_B.o'
- , 'OverloadedRecFldsFail10_C.hi', 'OverloadedRecFldsFail10_C.o']),
- multimod_compile_fail, ['overloadedrecfldsfail10', ''])
-test('overloadedrecfldsfail11',
- extra_clean(['OverloadedRecFldsFail11_A.hi', 'OverloadedRecFldsFail11_A.o']),
- multimod_compile_fail, ['overloadedrecfldsfail11', ''])
-test('overloadedrecfldsfail12',
- extra_clean(['OverloadedRecFldsFail12_A.hi', 'OverloadedRecFldsFail12_A.o']),
- multimod_compile_fail, ['overloadedrecfldsfail12', ''])
+test('overloadedrecfldsfail10', [], multimod_compile_fail,
+ ['overloadedrecfldsfail10', ''])
+test('overloadedrecfldsfail11', [], multimod_compile_fail,
+ ['overloadedrecfldsfail11', ''])
+test('overloadedrecfldsfail12', [], multimod_compile_fail,
+ ['overloadedrecfldsfail12', ''])
test('overloadedrecfldsfail13', normal, compile_fail, [''])
test('overloadedrecfldsfail14', normal, compile_fail, [''])
test('overloadedlabelsfail01', normal, compile_fail, [''])
test('T11103', normal, compile_fail, [''])
-test('T11167_ambiguous_fixity',
- extra_clean([ 'T11167_ambiguous_fixity_A.hi', 'T11167_ambiguous_fixity_A.o'
- , 'T11167_ambiguous_fixity_B.hi', 'T11167_ambiguous_fixity_B.o' ]),
- multimod_compile_fail, ['T11167_ambiguous_fixity', ''])
+test('T11167_ambiguous_fixity', [], multimod_compile_fail,
+ ['T11167_ambiguous_fixity', ''])
test('NoParent', normal, compile_fail, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_run/all.T b/testsuite/tests/overloadedrecflds/should_run/all.T
index 6d0655b12d..ad70a098c2 100644
--- a/testsuite/tests/overloadedrecflds/should_run/all.T
+++ b/testsuite/tests/overloadedrecflds/should_run/all.T
@@ -1,9 +1,7 @@
-test('overloadedrecfldsrun01',
- extra_clean(['OverloadedRecFldsRun01_A.hi', 'OverloadedRecFldsRun01_A.o']),
- multimod_compile_and_run, ['overloadedrecfldsrun01', ''])
-test('overloadedrecfldsrun02',
- extra_clean(['OverloadedRecFldsRun02_A.hi', 'OverloadedRecFldsRun02_A.o']),
- multimod_compile_and_run, ['overloadedrecfldsrun02', ''])
+test('overloadedrecfldsrun01', [], multimod_compile_and_run,
+ ['overloadedrecfldsrun01', ''])
+test('overloadedrecfldsrun02', [], multimod_compile_and_run,
+ ['overloadedrecfldsrun02', ''])
test('overloadedrecfldsrun03', normal, compile_and_run, [''])
test('overloadedrecfldsrun04', omit_ways(prof_ways), compile_and_run, [''])
test('overloadedrecfldsrun05', normal, compile_and_run, [''])
@@ -12,8 +10,5 @@ test('overloadedrecflds_generics', normal, compile_and_run, [''])
test('overloadedlabelsrun01', normal, compile_and_run, [''])
test('overloadedlabelsrun02', normal, compile_and_run, [''])
test('overloadedlabelsrun03', normal, compile_and_run, [''])
-test('overloadedlabelsrun04',
- [extra_clean(['OverloadedLabelsRun04_A.hi', 'OverloadedLabelsRun04_A.o']),
- omit_ways(prof_ways)],
- multimod_compile_and_run,
+test('overloadedlabelsrun04', [omit_ways(prof_ways)], multimod_compile_and_run,
['overloadedlabelsrun04', config.ghc_th_way_flags])
diff --git a/testsuite/tests/parser/prog001/test.T b/testsuite/tests/parser/prog001/test.T
index b667211196..80a3e5d341 100644
--- a/testsuite/tests/parser/prog001/test.T
+++ b/testsuite/tests/parser/prog001/test.T
@@ -1,4 +1 @@
-test('parser.prog001',
- extra_clean(['Read006.hi', 'Read006.o', 'Read007.hi', 'Read007.o']),
- multimod_compile,
- ['Read007.hs', '-v0'])
+test('parser.prog001', [], multimod_compile, ['Read007.hs', '-v0'])
diff --git a/testsuite/tests/parser/should_compile/T7476/all.T b/testsuite/tests/parser/should_compile/T7476/all.T
index 70750b4710..cef48ae4a5 100644
--- a/testsuite/tests/parser/should_compile/T7476/all.T
+++ b/testsuite/tests/parser/should_compile/T7476/all.T
@@ -2,5 +2,4 @@
# This test is in its own subdirectory as it needs to use the global
# filename "Main.imports"
-test('T7476', extra_clean(['Main.imports']), run_command,
- ['$MAKE -s --no-print-directory T7476'])
+test('T7476', [], run_command, ['$MAKE -s --no-print-directory T7476'])
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 22a952474e..e04cd668e1 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -82,8 +82,7 @@ test('read068', normal, compile, [''])
test('read069', normal, compile, [''])
test('read_1821', normal, compile, [''])
test('T2245', normal, compile, ['-fwarn-type-defaults'])
-test('T3303', extra_clean(['T3303A.hi', 'T3303A.o']),
- multimod_compile, ['T3303', '-v0'])
+test('T3303', [], multimod_compile, ['T3303', '-v0'])
test('T3741', normal, compile, [''])
test('DoAndIfThenElse', normal, compile, [''])
test('NondecreasingIndentation', normal, compile, [''])
@@ -92,8 +91,7 @@ test('mc16', normal, compile, [''])
test('EmptyDecls', normal, compile, [''])
test('ParserLambdaCase', [], compile, [''])
-test('T5243', extra_clean(['T5243A.hi', 'T5243A.o']),
- multimod_compile, ['T5243',''])
+test('T5243', [], multimod_compile, ['T5243', ''])
test('T7118', normal, compile, [''])
test('T7776', normal, compile, [''])
test('RdrNoStaticPointers01', [], compile, [''])
diff --git a/testsuite/tests/parser/unicode/all.T b/testsuite/tests/parser/unicode/all.T
index cd69f0d161..55f7fd09be 100644
--- a/testsuite/tests/parser/unicode/all.T
+++ b/testsuite/tests/parser/unicode/all.T
@@ -20,7 +20,7 @@ test('T1744', normal, compile_and_run, [''])
test('T1103', normal, compile, [''])
test('T2302', only_ways(['normal']), compile_fail, [''])
test('T4373', normal, compile, [''])
-test('T6016', extra_clean(['T6016-twoBOMs']), compile_and_run, ['-package ghc'])
+test('T6016', [], compile_and_run, ['-package ghc'])
test('T7671', normal, compile, [''])
# TODO: This test ought to be run in a non-UTF8 locale, but this is not yet
# supported by the test suite (see 10907)
diff --git a/testsuite/tests/partial-sigs/should_compile/all.T b/testsuite/tests/partial-sigs/should_compile/all.T
index 10cdfaaf35..6d98817ae2 100644
--- a/testsuite/tests/partial-sigs/should_compile/all.T
+++ b/testsuite/tests/partial-sigs/should_compile/all.T
@@ -50,9 +50,8 @@ test('TypeFamilyInstanceLHS', normal, compile, ['-ddump-types -fno-warn-partial-
test('Uncurry', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('UncurryNamed', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
test('WarningWildcardInstantiations', normal, compile, ['-ddump-types'])
-test('SplicesUsed',
- [req_interp, extra_clean(['Splices.o', 'Splices.hi']), omit_ways(prof_ways)],
- multimod_compile, ['SplicesUsed', config.ghc_th_way_flags])
+test('SplicesUsed', [req_interp, omit_ways(prof_ways)], multimod_compile,
+ ['SplicesUsed', config.ghc_th_way_flags])
test('TypedSplice', [req_interp, normal], compile, [''])
test('T10403', normal, compile, [''])
test('T10438', normal, compile, [''])
diff --git a/testsuite/tests/partial-sigs/should_fail/all.T b/testsuite/tests/partial-sigs/should_fail/all.T
index 42bd088c12..ff4647a35f 100644
--- a/testsuite/tests/partial-sigs/should_fail/all.T
+++ b/testsuite/tests/partial-sigs/should_fail/all.T
@@ -4,10 +4,9 @@ test('Defaulting1MROff', normal, compile, [''])
test('ExtraConstraintsWildcardInExpressionSignature', normal, compile, [''])
test('ExtraConstraintsWildcardInPatternSignature', normal, compile_fail, [''])
test('ExtraConstraintsWildcardInPatternSplice', normal, compile_fail, [''])
-test('ExtraConstraintsWildcardInTypeSpliceUsed',
- [req_interp,
- extra_clean(['ExtraConstraintsWildcardInTypeSplice.o', 'ExtraConstraintsWildcardInTypeSplice.hi'])],
- multimod_compile_fail, ['ExtraConstraintsWildcardInTypeSpliceUsed', config.ghc_th_way_flags])
+test('ExtraConstraintsWildcardInTypeSpliceUsed', [req_interp],
+ multimod_compile_fail,
+ ['ExtraConstraintsWildcardInTypeSpliceUsed', config.ghc_th_way_flags])
test('ExtraConstraintsWildcardInTypeSplice2',
[expect_broken(11101), req_interp],
compile_fail, [''])
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 6bd1461efc..1b724245b7 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -18,23 +18,23 @@ test('T8584-3', normal, compile, [''])
test('T8968-1', normal, compile, [''])
test('T8968-2', normal, compile, [''])
test('T8968-3', normal, compile, [''])
-test('ImpExp_Imp', [extra_clean(['ImpExp_Exp.hi', 'ImpExp_Exp.o'])], multimod_compile, ['ImpExp_Imp', '-v0'])
+test('ImpExp_Imp', [], multimod_compile, ['ImpExp_Imp', '-v0'])
test('T9857', normal, compile, [''])
test('T9889', normal, compile, [''])
test('T9867', normal, compile, [''])
test('T9975a', normal, compile_fail, [''])
test('T9975b', normal, compile, [''])
test('T10747', normal, compile, [''])
-test('T10997', [extra_clean(['T10997a.hi', 'T10997a.o'])], multimod_compile, ['T10997', '-v0'])
-test('T10997_1', [extra_clean(['T10997_1a.hi', 'T10997_1a.o'])], multimod_compile, ['T10997_1', '-v0'])
+test('T10997', [], multimod_compile, ['T10997', '-v0'])
+test('T10997_1', [], multimod_compile, ['T10997_1', '-v0'])
test('records-compile', normal, compile, [''])
test('records-poly', normal, compile, [''])
test('records-req', normal, compile, [''])
test('records-prov-req', normal, compile, [''])
test('records-req-only', normal, compile, [''])
-test('pat-syn-bundle', [extra_clean(['BundleInternal1.hi', 'BundleInternal1.o'])], multimod_compile, ['Bundle1', '-v0'])
-test('pat-syn-trans-bundle', [extra_clean(['Bundle.hi', 'Bundle.o', 'BundleInternal.hi', 'BundleInternal.o'])], multimod_compile, ['TransBundle', '-v0'])
-test('ExportSyntaxImport', [extra_clean(['ExportSyntax.hi', 'ExportSyntax.o'])], multimod_compile, ['ExportSyntaxImport', '-v0'])
+test('pat-syn-bundle', [], multimod_compile, ['Bundle1', '-v0'])
+test('pat-syn-trans-bundle', [], multimod_compile, ['TransBundle', '-v0'])
+test('ExportSyntaxImport', [], multimod_compile, ['ExportSyntaxImport', '-v0'])
test('poly-export', normal, compile, [''])
test('poly-export2', normal, compile, [''])
test('poly-export3', normal, compile, [''])
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 1560e7ea2e..be262ba1a9 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -112,10 +112,7 @@ test('T4321',
omit_ways(['ghci']),
compile_and_run, ['-O ' + sse2_opts])
-test('T3736',
- extra_clean(['T3736.speed.f32']),
- run_command,
- ['$MAKE -s --no-print-directory T3736'])
+test('T3736', [], run_command, ['$MAKE -s --no-print-directory T3736'])
test('T3738',
[extra_clean(['T3738a.hi', 'T3738a.o']),
stats_num_field('peak_megabytes_allocated', (2, 0)),
@@ -148,16 +145,7 @@ test('MethSharing',
],
compile_and_run,
['-O'])
-test('T2902',
- extra_clean(['T2902_A', 'T2902_B',
- 'T2902_A.hi', 'T2902_B.hi',
- 'T2902_A.o', 'T2902_B.o',
- 'T2902_A_PairingSum.hi', 'T2902_B_PairingSum.hi',
- 'T2902_A_PairingSum.o', 'T2902_B_PairingSum.o',
- 'T2902_Sum.hi',
- 'T2902_Sum.o']),
- run_command,
- ['$MAKE -s --no-print-directory T2902'])
+test('T2902', [], run_command, ['$MAKE -s --no-print-directory T2902'])
test('T149',
[ # expect_broken(149),
# working (2 Jul 2013, x86-64/Linux)
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 26f377cd1e..580498ff2f 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -1,77 +1,52 @@
setTestOpts(req_interp)
test('plugins01',
- [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C simple-plugin clean.plugins01')],
- run_command,
- ['$MAKE -s --no-print-directory plugins01'])
+ [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01 TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory plugins01'])
test('plugins02',
- [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins02 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C simple-plugin clean.plugins02')],
+ [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins02 TOP={top}')],
compile_fail,
['-package-db simple-plugin/pkg.plugins02/local.package.conf -fplugin Simple.BadlyTypedPlugin -package simple-plugin ' + config.plugin_way_flags])
test('plugins03',
- [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins03 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C simple-plugin clean.plugins03')],
+ [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins03 TOP={top}')],
compile_fail,
['-package-db simple-plugin/pkg.plugins03/local.package.conf -fplugin Simple.NonExistantPlugin -package simple-plugin'])
-test('plugins04',
- extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']),
- multimod_compile_fail,
+test('plugins04', [], multimod_compile_fail,
['plugins04', '-package ghc -fplugin HomePackagePlugin'])
-test('plugins05',
- [ extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']),
- only_ways([config.ghc_plugin_way]) ],
+test('plugins05', [only_ways([config.ghc_plugin_way])],
multimod_compile_and_run, ['plugins05', '-package ghc'])
test('plugins06',
- [ extra_clean(['LinkerTicklingPlugin.hi', 'LinkerTicklingPlugin.o']),
- unless(have_dynamic(),skip),
- only_ways([config.ghc_plugin_way]) ],
+ [unless(have_dynamic(), skip), only_ways([config.ghc_plugin_way])],
multimod_compile_and_run, ['plugins06', '-package ghc'])
test('plugins07',
- [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.plugins07 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin clean.plugins07')],
- run_command,
- ['$MAKE -s --no-print-directory plugins07'])
+ [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.plugins07 TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory plugins07'])
test('T10420',
- [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T10420 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin clean.T10420')],
- run_command,
- ['$MAKE -s --no-print-directory T10420'])
+ [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T10420 TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory T10420'])
test('T10294',
- [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C annotation-plugin clean.T10294')],
- run_command,
- ['$MAKE -s --no-print-directory T10294'])
+ [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294 TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory T10294'])
test('T10294a',
- [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294a TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C annotation-plugin clean.T10294a')],
- run_command,
- ['$MAKE -s --no-print-directory T10294a'])
+ [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294a TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory T10294a'])
-test('frontend01',
- [extra_clean(['FrontendPlugin.hi', 'FrontendPlugin.o',
- 'frontend01', 'frontend01.o', 'frontend01.hi']),
- unless(have_dynamic(), expect_broken(10301))],
- run_command, ['$MAKE -s --no-print-directory frontend01'])
+test('frontend01', [unless(have_dynamic(), expect_broken(10301))], run_command,
+ ['$MAKE -s --no-print-directory frontend01'])
test('T11244',
- [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T11244 TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin clean.T11244')],
- run_command,
- ['$MAKE -s --no-print-directory T11244'])
+ [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T11244 TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory T11244'])
test('T12567a',
- [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.T12567a TOP={top}'),
- clean_cmd('$MAKE -s --no-print-directory -C simple-plugin clean.T12567a')],
- run_command,
- ['$MAKE -s --no-print-directory T12567a'])
+ [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.T12567a TOP={top}')],
+ run_command, ['$MAKE -s --no-print-directory T12567a'])
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index c5ec8ace85..4cdcc17f2c 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -61,10 +61,7 @@ test('T7128', normal, compile,[''])
test('T7151', normal, compile_fail,[''])
test('T7095', normal, compile,[''])
test('T7090', normal, compile,[''])
-test('T7272',
- extra_clean(['T7272a.hi', 'T7272a.o', 'T7272.hi-boot', 'T7272.o-boot']),
- multimod_compile,
- ['T7272.hs', '-v0'])
+test('T7272', [], multimod_compile, ['T7272.hs', '-v0'])
test('T7176', normal, compile,[''])
test('T7224', normal, compile_fail,[''])
test('T7230', normal, compile_fail,[''])
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index d85a2b8e6a..f0904ee039 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -1,15 +1,12 @@
# Test for #1227, #1418
test('heapprof002',
- [ pre_cmd('cp heapprof001.hs heapprof002.hs')
- , extra_clean(['heapprof002.hs'])
- , extra_ways(['normal_h'])
- , extra_run_opts('7')
- ],
+ [pre_cmd('cp heapprof001.hs heapprof002.hs'), extra_ways(['normal_h']),
+ extra_run_opts('7')],
compile_and_run, [''])
-test('T11489', [req_profiling, extra_clean(['T11489.prof', 'T11489.hp'])],
- run_command, ['$MAKE -s --no-print-directory T11489'])
+test('T11489', [req_profiling], run_command,
+ ['$MAKE -s --no-print-directory T11489'])
# Below this line, run tests only with profiling ways.
setTestOpts(req_profiling)
diff --git a/testsuite/tests/programs/10queens/test.T b/testsuite/tests/programs/10queens/test.T
index ac0435150e..28ebc1f2f3 100644
--- a/testsuite/tests/programs/10queens/test.T
+++ b/testsuite/tests/programs/10queens/test.T
@@ -1,6 +1,2 @@
-test('10queens',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
+test('10queens', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/Queens/test.T b/testsuite/tests/programs/Queens/test.T
index 77cf3750b5..24ff04f898 100644
--- a/testsuite/tests/programs/Queens/test.T
+++ b/testsuite/tests/programs/Queens/test.T
@@ -1,6 +1,2 @@
-test('queens',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o'])],
- compile_and_run,
- [''])
+test('queens', [when(fast(), skip)], compile_and_run, [''])
diff --git a/testsuite/tests/programs/andre_monad/test.T b/testsuite/tests/programs/andre_monad/test.T
index e76b0f13e7..eeee41e800 100644
--- a/testsuite/tests/programs/andre_monad/test.T
+++ b/testsuite/tests/programs/andre_monad/test.T
@@ -1,7 +1,2 @@
-test('andre_monad',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o']),
- ],
- multimod_compile_and_run,
+test('andre_monad', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/andy_cherry/test.T b/testsuite/tests/programs/andy_cherry/test.T
index 511eac5051..72508fc423 100644
--- a/testsuite/tests/programs/andy_cherry/test.T
+++ b/testsuite/tests/programs/andy_cherry/test.T
@@ -1,14 +1,3 @@
-test('andy_cherry',
- [when(fast(), skip),
- 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'])
-
+test('andy_cherry', [when(fast(), skip), extra_run_opts('.')],
+ multimod_compile_and_run, ['Main', '-cpp'])
diff --git a/testsuite/tests/programs/cholewo-eval/test.T b/testsuite/tests/programs/cholewo-eval/test.T
index 3b418d4ac1..71fd6a1932 100644
--- a/testsuite/tests/programs/cholewo-eval/test.T
+++ b/testsuite/tests/programs/cholewo-eval/test.T
@@ -1,5 +1,2 @@
-test('cholewo-eval',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o', 'Arr.hi', 'Arr.o'])],
- multimod_compile_and_run,
+test('cholewo-eval', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/cvh_unboxing/test.T b/testsuite/tests/programs/cvh_unboxing/test.T
index abea53b354..4d088119e4 100644
--- a/testsuite/tests/programs/cvh_unboxing/test.T
+++ b/testsuite/tests/programs/cvh_unboxing/test.T
@@ -1,8 +1,2 @@
-test('cvh_unboxing',
- [when(fast(), skip),
- extra_clean(['Append.hi', 'Append.o',
- 'Main.hi', 'Main.o',
- 'Types.hi', 'Types.o'])],
- multimod_compile_and_run,
+test('cvh_unboxing', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/fast2haskell/test.T b/testsuite/tests/programs/fast2haskell/test.T
index 621c589188..90ca0be52c 100644
--- a/testsuite/tests/programs/fast2haskell/test.T
+++ b/testsuite/tests/programs/fast2haskell/test.T
@@ -1,8 +1,3 @@
-test('fast2haskell',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o',
- 'Fast2haskell.hi', 'Fast2haskell.o'])],
- multimod_compile_and_run,
+test('fast2haskell', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/fun_insts/test.T b/testsuite/tests/programs/fun_insts/test.T
index 98bcf3a32f..bd3276a28f 100644
--- a/testsuite/tests/programs/fun_insts/test.T
+++ b/testsuite/tests/programs/fun_insts/test.T
@@ -1,6 +1,2 @@
-test('fun_insts',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('fun_insts', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/galois_raytrace/test.T b/testsuite/tests/programs/galois_raytrace/test.T
index 94defefc6a..f563553993 100644
--- a/testsuite/tests/programs/galois_raytrace/test.T
+++ b/testsuite/tests/programs/galois_raytrace/test.T
@@ -3,22 +3,5 @@ if config.platform.startswith('i386-') and \
config.platform != 'i386-unknown-openbsd':
setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded']))
-test('galois_raytrace',
- [when(fast(), skip),
- 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'])
-
+test('galois_raytrace', [when(fast(), skip), reqlib('parsec')],
+ multimod_compile_and_run, ['Main', '-package parsec'])
diff --git a/testsuite/tests/programs/hs-boot/all.T b/testsuite/tests/programs/hs-boot/all.T
index dba72877e9..3790c88c9f 100644
--- a/testsuite/tests/programs/hs-boot/all.T
+++ b/testsuite/tests/programs/hs-boot/all.T
@@ -1,9 +1,4 @@
# This test is for bug #906, a problem with the ordering of
# compilations involving .hs-boot files, fixed in 6.6.
-test('hs-boot',
- extra_clean(['A.hi', 'A.hi-boot', 'A.o', 'A.o-boot',
- 'B.hi', 'B.o', 'C.hi', 'C.o',
- 'Main', 'Main.exe', 'Main.hi', 'Main.o']),
- multimod_compile,
- ['Main -v0', ''])
+test('hs-boot', [], multimod_compile, ['Main -v0', ''])
diff --git a/testsuite/tests/programs/jl_defaults/test.T b/testsuite/tests/programs/jl_defaults/test.T
index b17c0b8cb5..4b75ffaef5 100644
--- a/testsuite/tests/programs/jl_defaults/test.T
+++ b/testsuite/tests/programs/jl_defaults/test.T
@@ -1,6 +1,3 @@
-test('jl_defaults',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('jl_defaults', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/jq_readsPrec/test.T b/testsuite/tests/programs/jq_readsPrec/test.T
index dcad28cd7b..4d7ec4d730 100644
--- a/testsuite/tests/programs/jq_readsPrec/test.T
+++ b/testsuite/tests/programs/jq_readsPrec/test.T
@@ -1,6 +1,3 @@
-test('jq_readsPrec',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('jq_readsPrec', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/jtod_circint/test.T b/testsuite/tests/programs/jtod_circint/test.T
index b6ad840a26..69be1661b8 100644
--- a/testsuite/tests/programs/jtod_circint/test.T
+++ b/testsuite/tests/programs/jtod_circint/test.T
@@ -1,10 +1,3 @@
-test('jtod_circint',
- [when(fast(), skip),
- extra_clean(['Bit.hi', 'Bit.o',
- 'LogFun.hi', 'LogFun.o',
- 'Main.hi', 'Main.o',
- 'Signal.hi', 'Signal.o'])],
- multimod_compile_and_run,
+test('jtod_circint', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/jules_xref/test.T b/testsuite/tests/programs/jules_xref/test.T
index 25c1023507..32b484f07e 100644
--- a/testsuite/tests/programs/jules_xref/test.T
+++ b/testsuite/tests/programs/jules_xref/test.T
@@ -1,7 +1 @@
-test('jules_xref',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o']),
- ],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('jules_xref', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/jules_xref2/test.T b/testsuite/tests/programs/jules_xref2/test.T
index 2e627ab89c..f220128b3f 100644
--- a/testsuite/tests/programs/jules_xref2/test.T
+++ b/testsuite/tests/programs/jules_xref2/test.T
@@ -1,6 +1,3 @@
-test('jules_xref2',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('jules_xref2', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/launchbury/test.T b/testsuite/tests/programs/launchbury/test.T
index 0af619f4c1..fb7db1d751 100644
--- a/testsuite/tests/programs/launchbury/test.T
+++ b/testsuite/tests/programs/launchbury/test.T
@@ -1,6 +1,2 @@
-test('launchbury',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('launchbury', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/lennart_range/test.T b/testsuite/tests/programs/lennart_range/test.T
index 0cc5a351f5..68c27238e2 100644
--- a/testsuite/tests/programs/lennart_range/test.T
+++ b/testsuite/tests/programs/lennart_range/test.T
@@ -1,6 +1,3 @@
-test('lennart_range',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('lennart_range', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/lex/test.T b/testsuite/tests/programs/lex/test.T
index 79459772a0..b70605d5ee 100644
--- a/testsuite/tests/programs/lex/test.T
+++ b/testsuite/tests/programs/lex/test.T
@@ -1,6 +1,2 @@
-test('lex',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('lex', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/life_space_leak/test.T b/testsuite/tests/programs/life_space_leak/test.T
index a6d634a8f6..fe72a2567f 100644
--- a/testsuite/tests/programs/life_space_leak/test.T
+++ b/testsuite/tests/programs/life_space_leak/test.T
@@ -1,6 +1,2 @@
-test('life_space_leak',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('life_space_leak', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/north_array/test.T b/testsuite/tests/programs/north_array/test.T
index d822897d59..986087b0f1 100644
--- a/testsuite/tests/programs/north_array/test.T
+++ b/testsuite/tests/programs/north_array/test.T
@@ -1,6 +1,3 @@
-test('north_array',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('north_array', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/okeefe_neural/test.T b/testsuite/tests/programs/okeefe_neural/test.T
index e7e1f78c01..7f0282df97 100644
--- a/testsuite/tests/programs/okeefe_neural/test.T
+++ b/testsuite/tests/programs/okeefe_neural/test.T
@@ -10,9 +10,5 @@
def set_opts( name, opts ):
opts.expect = 'fail'
-test('okeefe_neural',
- [when(fast(), skip),
- set_opts,
- extra_clean(['Main.hi'])],
- multimod_compile_and_run,
+test('okeefe_neural', [when(fast(), skip), set_opts], multimod_compile_and_run,
['Main', '+RTS -M64m -RTS'])
diff --git a/testsuite/tests/programs/record_upd/test.T b/testsuite/tests/programs/record_upd/test.T
index 46149575b2..b8cdbadeec 100644
--- a/testsuite/tests/programs/record_upd/test.T
+++ b/testsuite/tests/programs/record_upd/test.T
@@ -1,6 +1,2 @@
-test('record_upd',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('record_upd', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/rittri/test.T b/testsuite/tests/programs/rittri/test.T
index 57e7805ea3..9b2fcf4fc9 100644
--- a/testsuite/tests/programs/rittri/test.T
+++ b/testsuite/tests/programs/rittri/test.T
@@ -1,6 +1,2 @@
-test('rittri',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
- ['Main', ''])
-
+test('rittri', [when(fast(), skip)], multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/programs/sanders_array/test.T b/testsuite/tests/programs/sanders_array/test.T
index 6e0a8c6e79..e2e9b209fc 100644
--- a/testsuite/tests/programs/sanders_array/test.T
+++ b/testsuite/tests/programs/sanders_array/test.T
@@ -1,6 +1,3 @@
-test('sanders_array',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('sanders_array', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/seward-space-leak/test.T b/testsuite/tests/programs/seward-space-leak/test.T
index 8c22eb50fa..935ebbf259 100644
--- a/testsuite/tests/programs/seward-space-leak/test.T
+++ b/testsuite/tests/programs/seward-space-leak/test.T
@@ -1,5 +1,2 @@
-test('seward-space-leak',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('seward-space-leak', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/strict_anns/test.T b/testsuite/tests/programs/strict_anns/test.T
index e64ee2fb7b..b210abde72 100644
--- a/testsuite/tests/programs/strict_anns/test.T
+++ b/testsuite/tests/programs/strict_anns/test.T
@@ -1,6 +1,3 @@
-test('strict_anns',
- [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
- multimod_compile_and_run,
+test('strict_anns', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/programs/thurston-modular-arith/test.T b/testsuite/tests/programs/thurston-modular-arith/test.T
index dc6a221013..3a38db7a9e 100644
--- a/testsuite/tests/programs/thurston-modular-arith/test.T
+++ b/testsuite/tests/programs/thurston-modular-arith/test.T
@@ -1,8 +1,3 @@
# uses GHC-specific scoped type variables
-test('thurston-modular-arith',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o', 'TypeVal.hi', 'TypeVal.o']),
- ],
- multimod_compile_and_run,
+test('thurston-modular-arith', [when(fast(), skip)], multimod_compile_and_run,
['Main', ''])
-
diff --git a/testsuite/tests/quasiquotation/all.T b/testsuite/tests/quasiquotation/all.T
index 7e65cba791..84d25f8bdd 100644
--- a/testsuite/tests/quasiquotation/all.T
+++ b/testsuite/tests/quasiquotation/all.T
@@ -1,17 +1,8 @@
test('T3953', req_interp, compile_fail, [''])
-test('T4150',
- [
- expect_broken(4150),
- extra_clean(['T4150A.hi', 'T4150A.o', 'T4150.hi', 'T4150.o'])],
- run_command,
+test('T4150', [expect_broken(4150)], run_command,
['$MAKE -s --no-print-directory T4150'])
test('T5204', req_interp, compile_fail, [''])
-test('T7918',
- [req_interp,
- extra_run_opts('"' + config.libdir + '"'),
- only_ways(config.ghc_th_way),
- unless(have_dynamic(),skip),
- extra_clean(['T7918A.hi', 'T7918A.o', 'T7918A.dyn_hi', 'T7918A.dyn_o',
- 'T7918B.hi', 'T7918B.o', 'T7918B.dyn_hi', 'T7918B.dyn_o'])],
- compile_and_run,
- ['-package ghc ' + config.ghc_th_way_flags])
+test('T7918',
+ [req_interp, extra_run_opts('"' + config.libdir + '"'),
+ only_ways(config.ghc_th_way), unless(have_dynamic(), skip)],
+ compile_and_run, ['-package ghc ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T
index b9cac424e7..e9beadda64 100644
--- a/testsuite/tests/quasiquotation/qq006/test.T
+++ b/testsuite/tests/quasiquotation/qq006/test.T
@@ -1,7 +1,2 @@
-test('qq006',
- [when(fast(), skip),
- reqlib('parsec'),
- extra_clean(['Expr.hi', 'Expr.o']),
- ],
- multimod_compile_fail,
+test('qq006', [when(fast(), skip), reqlib('parsec')], multimod_compile_fail,
['Main', '-v0'])
diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T
index dc01dfc3fb..3a2524b771 100644
--- a/testsuite/tests/quasiquotation/qq007/test.T
+++ b/testsuite/tests/quasiquotation/qq007/test.T
@@ -1,8 +1,4 @@
test('qq007',
- [when(fast(), skip),
- extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
- pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
- omit_ways(prof_ways),
- ],
- multimod_compile,
- ['Test', '-v0 ' + config.ghc_th_way_flags])
+ [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+ omit_ways(prof_ways)],
+ multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T
index 33e00376d5..f0827aa4f0 100644
--- a/testsuite/tests/quasiquotation/qq008/test.T
+++ b/testsuite/tests/quasiquotation/qq008/test.T
@@ -1,8 +1,4 @@
test('qq008',
- [when(fast(), skip),
- extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
- pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
- omit_ways(prof_ways),
- ],
- multimod_compile,
- ['Test', '-v0 ' + config.ghc_th_way_flags])
+ [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+ omit_ways(prof_ways)],
+ multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq009/test.T b/testsuite/tests/quasiquotation/qq009/test.T
index fb06834a58..9b355de096 100644
--- a/testsuite/tests/quasiquotation/qq009/test.T
+++ b/testsuite/tests/quasiquotation/qq009/test.T
@@ -1,8 +1,4 @@
test('qq009',
- [when(fast(), skip),
- extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
- pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
- omit_ways(prof_ways),
- ],
- multimod_compile,
- ['Test', '-v0 ' + config.ghc_th_way_flags])
+ [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+ omit_ways(prof_ways)],
+ multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/test.T b/testsuite/tests/quotes/TH_spliceViewPat/test.T
index 1f802c5068..6e9b397026 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/test.T
+++ b/testsuite/tests/quotes/TH_spliceViewPat/test.T
@@ -3,6 +3,5 @@ def f(name, opts):
setTestOpts(f)
-test('TH_spliceViewPat',
- [extra_clean(['Main.o', 'Main.hi', 'A.o', 'A.hi']), omit_ways(prof_ways)],
- multimod_compile_and_run, ['Main', config.ghc_th_way_flags])
+test('TH_spliceViewPat', [omit_ways(prof_ways)], multimod_compile_and_run,
+ ['Main', config.ghc_th_way_flags])
diff --git a/testsuite/tests/rename/prog001/test.T b/testsuite/tests/rename/prog001/test.T
index ad1a5fef70..85992e3f93 100644
--- a/testsuite/tests/rename/prog001/test.T
+++ b/testsuite/tests/rename/prog001/test.T
@@ -1,4 +1 @@
-test('rename.prog001',
- extra_clean(['Rn037Help.hi', 'Rn037Help.o', 'rn037.hi', 'rn037.o']),
- multimod_compile,
- ['rn037', '-v0'])
+test('rename.prog001', [], multimod_compile, ['rn037', '-v0'])
diff --git a/testsuite/tests/rename/prog002/test.T b/testsuite/tests/rename/prog002/test.T
index 0aa4c39057..270faf591d 100644
--- a/testsuite/tests/rename/prog002/test.T
+++ b/testsuite/tests/rename/prog002/test.T
@@ -1,4 +1 @@
-test('rename.prog002',
- extra_clean(['Rn037Help.hi', 'Rn037Help.o']),
- multimod_compile_fail,
- ['rnfail037', '-v0'])
+test('rename.prog002', [], multimod_compile_fail, ['rnfail037', '-v0'])
diff --git a/testsuite/tests/rename/prog003/test.T b/testsuite/tests/rename/prog003/test.T
index 7d4c06ab0e..0596e01d1a 100644
--- a/testsuite/tests/rename/prog003/test.T
+++ b/testsuite/tests/rename/prog003/test.T
@@ -1,4 +1 @@
-test('rename.prog003',
- extra_clean(['A.hi', 'A.o']),
- multimod_compile_fail,
- ['B', '-v0'])
+test('rename.prog003', [], multimod_compile_fail, ['B', '-v0'])
diff --git a/testsuite/tests/rename/prog004/test.T b/testsuite/tests/rename/prog004/test.T
index 4d97d580c0..ddd2889b08 100644
--- a/testsuite/tests/rename/prog004/test.T
+++ b/testsuite/tests/rename/prog004/test.T
@@ -1,4 +1 @@
-test('rename.prog004',
- extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o', 'C.hi', 'C.o']),
- multimod_compile,
- ['C', '-v0'])
+test('rename.prog004', [], multimod_compile, ['C', '-v0'])
diff --git a/testsuite/tests/rename/prog005/test.T b/testsuite/tests/rename/prog005/test.T
index c5ada84151..0c4d1b7a08 100644
--- a/testsuite/tests/rename/prog005/test.T
+++ b/testsuite/tests/rename/prog005/test.T
@@ -1,7 +1 @@
-test('rename.prog005',
- [
- extra_clean(['VersionGraphClient.o-boot','VersionGraphClient.hi-boot',
- 'VersionGraphClient.hi', 'VersionGraphClient.o',
- 'ViewType.hi', 'ViewType.o', 'View.hi', 'View.o'])],
- multimod_compile,
- ['View', '-v0'])
+test('rename.prog005', [], multimod_compile, ['View', '-v0'])
diff --git a/testsuite/tests/rename/prog006/all.T b/testsuite/tests/rename/prog006/all.T
index 8ff248ff12..bf63fd835a 100644
--- a/testsuite/tests/rename/prog006/all.T
+++ b/testsuite/tests/rename/prog006/all.T
@@ -1,7 +1,2 @@
-test('rn.prog006',
- extra_clean(['A.hi', 'A.o', 'B/C.hi', 'B/C.o',
- 'Main.hi', 'Main.o', 'pkg.conf',
- 'pwd', 'pwd.exe', 'pwd.exe.manifest',
- 'pwd.hi', 'pwd.o', 'local.package.conf']),
- run_command,
+test('rn.prog006', [], run_command,
['$MAKE -s --no-print-directory rn.prog006'])
diff --git a/testsuite/tests/rename/should_compile/T3103/test.T b/testsuite/tests/rename/should_compile/T3103/test.T
index 24745b4b08..4a925085de 100644
--- a/testsuite/tests/rename/should_compile/T3103/test.T
+++ b/testsuite/tests/rename/should_compile/T3103/test.T
@@ -1,14 +1,5 @@
# Args to vtc are: extra compile flags
-test('T3103',
- [
- extra_clean(['Foreign/Ptr.hi', 'Foreign/Ptr.o',
- 'GHC/Base.hi', 'GHC/Base.o',
- 'GHC/Num.hi', 'GHC/Num.o',
- 'GHC/Show.hi', 'GHC/Show.o',
- 'GHC/Unicode.hi', 'GHC/Unicode.hi-boot',
- 'GHC/Unicode.o', 'GHC/Unicode.o-boot',
- 'GHC/Word.hi', 'GHC/Word.o'])],
- multimod_compile,
- ['Foreign.Ptr', '-v0 -hide-all-packages -package ghc-prim -package integer-gmp -this-unit-id base'])
-
+test('T3103', [], multimod_compile,
+ ['Foreign.Ptr',
+ '-v0 -hide-all-packages -package ghc-prim -package integer-gmp -this-unit-id base'])
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 296390524a..d2c1aaaa80 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -3,33 +3,13 @@
test('rn003', normal, compile, [''])
test('rn005', normal, compile, [''])
test('rn006', normal, compile, [''])
-test('rn009',
- [
- extra_clean(['Imp10Aux.hi', 'Imp10Aux.o',
- 'Imp10Aux.hi-boot', 'Imp10Aux.o-boot'])],
- multimod_compile,
- ['rn009', '-v0'])
+test('rn009', [], multimod_compile, ['rn009', '-v0'])
# rn10 tests the same things as 009,011,012
#test('rn010', normal, multimod_compile, ['rn010', '-v0'])
-test('rn011',
- [
- extra_clean(['Imp100Aux.hi', 'Imp100Aux.o',
- 'Imp100Aux.hi-boot', 'Imp100Aux.o-boot'])],
- multimod_compile,
- ['rn011', '-v0'])
-test('rn012',
- [
- extra_clean(['Imp500Aux.hi', 'Imp500Aux.o',
- 'Imp500Aux.hi-boot', 'Imp500Aux.o-boot'])],
- multimod_compile,
- ['rn012', '-v0'])
+test('rn011', [], multimod_compile, ['rn011', '-v0'])
+test('rn012', [], multimod_compile, ['rn012', '-v0'])
test('rn013', normal, compile, [''])
-test('rn017',
- [
- extra_clean(['RnAux017.hi', 'RnAux017.o',
- 'RnAux017.hi-boot', 'RnAux017.o-boot'])],
- multimod_compile,
- ['rn017', '-v0'])
+test('rn017', [], multimod_compile, ['rn017', '-v0'])
test('rn019', normal, compile, [''])
test('rn020', normal, compile, [''])
test('rn022', normal, compile, [''])
@@ -54,61 +34,39 @@ test('rn037', normal, compile, [''])
test('rn039', normal, compile, [''])
test('rn040', normal, compile, ['-fwarn-unused-binds -fwarn-unused-matches'])
test('rn041', expect_broken_for(10181, ['optasm', 'optllvm']), compile, [''])
-test('rn042',
- extra_clean(['Rn042_A.hi', 'Rn042_A.o']),
- multimod_compile,
- ['rn042', '-v0'])
-test('rn043',
- extra_clean(['Rn043_A.hi', 'Rn043_A.o', 'Rn043_B.hi', 'Rn043_B.o']),
- multimod_compile, ['rn043', '-v0'])
-test('rn044',
- extra_clean(['Rn044_A.hi', 'Rn044_A.o', 'Rn044_B.hi', 'Rn044_B.o']),
- multimod_compile, ['rn044', '-v0'])
+test('rn042', [], multimod_compile, ['rn042', '-v0'])
+test('rn043', [], multimod_compile, ['rn043', '-v0'])
+test('rn044', [], multimod_compile, ['rn044', '-v0'])
test('rn045', normal, compile, [''])
test('rn046', normal, compile, ['-W'])
test('rn047', normal, compile, ['-W'])
test('rn048', normal, compile, ['-W'])
test('rn049', normal, compile, ['-W'])
-test('rn050',
- extra_clean(['Rn050_A.hi', 'Rn050_A.o']),
- multimod_compile, ['rn050', '-v0'])
+test('rn050', [], multimod_compile, ['rn050', '-v0'])
test('rn051', normal, compile, [''])
-test('rn052',
- extra_clean(['Rn052Aux.hi', 'Rn052Aux.o']),
- multimod_compile, ['rn052', '-v0'])
+test('rn052', [], multimod_compile, ['rn052', '-v0'])
-test('rn053',
- extra_clean(['Rn053_A.hi', 'Rn053_A.o', 'Rn053_B.hi', 'Rn053_B.o']),
- multimod_compile, ['rn053', '-v0'])
+test('rn053', [], multimod_compile, ['rn053', '-v0'])
test('rn054', normal, compile, [''])
test('rn055', normal, compile, [''])
test('rn056', normal, compile, [''])
test('rn057', normal, compile, [''])
test('rn058', normal, compile, [''])
-test('rn059',
- extra_clean(['Rn059_A.hi', 'Rn059_A.o', 'Rn059_B.hi', 'Rn059_B.o']),
- multimod_compile, ['rn059', '-v0'])
+test('rn059', [], multimod_compile, ['rn059', '-v0'])
test('rn060', normal, compile, [''])
test('rn061', normal, compile, [''])
test('rn062', normal, compile, [''])
test('rn063', normal, compile, [''])
test('rn064', normal, compile, [''])
-test('rn065',
- extra_clean(['Rn065A.hi', 'Rn065A.o']),
- multimod_compile,
- ['rn065', '-v0'])
+test('rn065', [], multimod_compile, ['rn065', '-v0'])
-test('rn066',
- extra_clean(['Rn066_A.hi', 'Rn066_A.o']),
- multimod_compile, ['rn066', '-v0'])
+test('rn066', [], multimod_compile, ['rn066', '-v0'])
-test('rn067',
- extra_clean(['Rn067_A.hi', 'Rn067_A.o']),
- multimod_compile, ['rn067', '-v0'])
+test('rn067', [], multimod_compile, ['rn067', '-v0'])
test('rn068', normal, compile, [''])
@@ -137,36 +95,17 @@ test('timing001', normal, compile, [''])
test('timing002', normal, compile, [''])
test('timing003', normal, compile, [''])
-test('T1792_imports', extra_clean(['T1792_imports.imports']), run_command,
+test('T1792_imports', [], run_command,
['$MAKE -s --no-print-directory T1792_imports'])
-test('T3823',
- extra_clean(['T3823A.hi-boot', 'T3823A.hi', 'T3823B.hi',
- 'T3823A.o-boot', 'T3823A.o', 'T3823B.o']),
- run_command,
- ['$MAKE -s --no-print-directory T3823'])
-
-test('T4003',
- extra_clean(['T4003A.hi-boot', 'T4003A.hi', 'T4003B.hi',
- 'T4003A.o-boot', 'T4003A.o', 'T4003B.o']),
- run_command,
- ['$MAKE -s --no-print-directory T4003'])
+test('T3823', [], run_command, ['$MAKE -s --no-print-directory T3823'])
+
+test('T4003', [], run_command, ['$MAKE -s --no-print-directory T4003'])
test('T1789', normal, compile, [''])
test('T1789_2', normal, compile, [''])
-test('T3449',
- extra_clean(['T3449.hi-boot', 'T3449A.hi',
- 'T3449.o-boot', 'T3449A.o']),
- run_command,
- ['$MAKE -s --no-print-directory T3449'])
-test('T4239',
- extra_clean(['T4239A.hi', 'T4239A.o', 'T4239.imports']),
- run_command,
- ['$MAKE -s --no-print-directory T4239'])
-test('T4240',
- [extra_clean(['T4240A.hi', 'T4240A.o', 'T4240B.hi', 'T4240B.o',
- 'T4240.imports'])],
- run_command,
- ['$MAKE -s --no-print-directory T4240'])
+test('T3449', [], run_command, ['$MAKE -s --no-print-directory T3449'])
+test('T4239', [], run_command, ['$MAKE -s --no-print-directory T4239'])
+test('T4240', [], run_command, ['$MAKE -s --no-print-directory T4240'])
test('T4489', normal, compile, [''])
test('T4478', normal, compile, [''])
@@ -176,27 +115,12 @@ test('mc09', normal, compile, [''])
test('mc10', normal, compile, [''])
test('mc11', normal, compile, [''])
test('mc12', normal, compile, [''])
-test('T2436',
- [
- extra_clean(['T2436a.hi', 'T2436a.o']) ],
- multimod_compile,
- ['T2436', '-v0'])
+test('T2436', [], multimod_compile, ['T2436', '-v0'])
test('T5331', normal, compile, ['']) # Unused tyvar warnings
test('T5334', normal, compile, ['']) # Unused tyvar warnings
-test('T5306',
- [
- extra_clean(['T5306a.hi', 'T5306a.o',
- 'T5306b.hi', 'T5306b.o'])],
- multimod_compile,
- ['T5306', '-v0'])
-test('T5592',
- [
- extra_clean(['T5592a.hi', 'T5592a.o'])],
- multimod_compile_and_run,
- ['T5592', '-v0'])
-test('T5867',
- extra_clean(['T5867a.hi', 'T5867a.o']),
- multimod_compile, ['T5867', '-v0'])
+test('T5306', [], multimod_compile, ['T5306', '-v0'])
+test('T5592', [], multimod_compile_and_run, ['T5592', '-v0'])
+test('T5867', [], multimod_compile, ['T5867', '-v0'])
test('T6027', normal, compile, [''])
test('T6120', normal, compile, [''])
test('T7007', normal, compile, [''])
@@ -204,44 +128,24 @@ test('T7085', normal, compile, [''])
test('T7145a', normal, compile, ['-Wall -Werror'])
test('T7145b', normal, compile, ['-Wall'])
test('T6038', normal, compile, [''])
-test('dodgy',
- [ extra_clean(['DodgyA.hi', 'DodgyA.o']) ],
- multimod_compile,
- ['dodgy', '-v0'])
+test('dodgy', [], multimod_compile, ['dodgy', '-v0'])
test('T7167', normal, compile, [''])
test('T7336', expect_broken(7336), compile, ['-Wall'])
test('T2435', normal, multimod_compile, ['T2435','-v0'])
test('T7672', normal, multimod_compile, ['T7672','-v0'])
-test('T7963',
- [extra_clean(['T7963a.hi', 'T7963a.o',
- 'T7963.imports'])],
- run_command,
- ['$MAKE -s --no-print-directory T7963'])
-test('T7969',
- [extra_clean(['T7969a.hi', 'T7969a.o',
- 'T7969.imports'])],
- run_command,
- ['$MAKE -s --no-print-directory T7969'])
+test('T7963', [], run_command, ['$MAKE -s --no-print-directory T7963'])
+test('T7969', [], run_command, ['$MAKE -s --no-print-directory T7969'])
test('T9127', normal, compile, [''])
test('T4426', normal, compile_fail, [''])
test('T9778', normal, compile, ['-fwarn-unticked-promoted-constructors'])
-test('T11164',
- extra_clean(['T11164a.hi', 'T11164a.o',
- 'T11164b.hi', 'T11164b.o']),
- multimod_compile, ['T11164', '-v0'])
+test('T11164', [], multimod_compile, ['T11164', '-v0'])
test('T11167', normal, compile, [''])
test('T11167_ambig', normal, compile, [''])
test('T10625', normal, compile, [''])
-test('T11624', extra_clean(['T11624a.hi', 'T11624a.o', 'T11624.hi-boot', 'T11624.o-boot']), multimod_compile, ['T11624', ''])
-test('T11662',
- [extra_clean(['T11662_A.hi', 'T11662_A.o'])],
- multimod_compile,
- ['T11662', '-v0'])
-test('T12127',
- [extra_clean(['T12127a.hi', 'T12127a.o'])],
- multimod_compile,
- ['T12127', '-v0'])
+test('T11624', [], multimod_compile, ['T11624', ''])
+test('T11662', [], multimod_compile, ['T11662', '-v0'])
+test('T12127', [], multimod_compile, ['T12127', '-v0'])
test('T12533', normal, compile, [''])
test('T12597', normal, compile, [''])
test('T12548', normal, compile, [''])
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 05fc5e496e..b64bd44be8 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -39,9 +39,7 @@ test('rnfail035', normal, compile_fail, [''])
test('rnfail039', normal, compile_fail, [''])
-test('rnfail040',
- extra_clean(['Rnfail040_A.hi', 'Rnfail040_A.o']),
- multimod_compile_fail, ['rnfail040', '-v0'])
+test('rnfail040', [], multimod_compile_fail, ['rnfail040', '-v0'])
test('rnfail041', normal, compile_fail, [''])
test('rnfail042', normal, compile_fail, [''])
@@ -49,10 +47,7 @@ test('rnfail043', unless(doing_ghci, skip), compile_fail, ['-v0'])
test('rnfail044', normal, compile_fail, [''])
test('rnfail045', normal, compile_fail, [''])
test('rnfail046', normal, compile_fail, [''])
-test('rnfail047',
- extra_clean(['RnFail047_A.hi-boot', 'RnFail047_A.o-boot']),
- multimod_compile_fail,
- ['rnfail047', '-v0'])
+test('rnfail047', [], multimod_compile_fail, ['rnfail047', '-v0'])
test('rnfail048', normal, compile_fail, [''])
test('rnfail049', normal, compile_fail, [''])
test('rnfail050', normal, compile_fail, [''])
@@ -60,11 +55,7 @@ test('rnfail051', normal, compile_fail, [''])
test('rnfail052', normal, compile_fail, [''])
test('rnfail053', normal, compile_fail, [''])
test('rnfail054', normal, compile_fail, [''])
-test('rnfail055',
- extra_clean(['RnFail055.hi-boot', 'RnFail055.o-boot',
- 'RnFail055_aux.hi', 'RnFail055_aux.o']),
- multimod_compile_fail,
- ['RnFail055','-v0'])
+test('rnfail055', [], multimod_compile_fail, ['RnFail055', '-v0'])
test('rnfail056', normal, compile_fail, [''])
test('rnfail057', normal, compile_fail, [''])
@@ -83,22 +74,14 @@ test('mc14', normal, compile_fail, [''])
test('T5211', normal, compile, ['']) # Warnings only
test('T1595a', normal, compile_fail, [''])
test('T5281', normal, multimod_compile, ['T5281', '-v0']) # Warnings only
-test('T5372',
- extra_clean(['T5372a.hi', 'T5372a.o']),
- multimod_compile_fail,
- ['T5372','-v0'])
-test('T5385',
- extra_clean(['T5385a.hi', 'T5385a.o']),
- multimod_compile_fail,
- ['T5385','-v0'])
+test('T5372', [], multimod_compile_fail, ['T5372', '-v0'])
+test('T5385', [], multimod_compile_fail, ['T5385', '-v0'])
test('T5513', normal, compile_fail, [''])
test('T5533', normal, compile_fail, [''])
test('T5589', normal, compile_fail, [''])
test('Misplaced', normal, compile_fail, [''])
test('T5657', normal, compile_fail, [''])
-test('T5745',
- extra_clean(['T5745a.hi', 'T5745a.o', 'T5745b.hi', 'T5745b.o']),
- multimod_compile_fail, ['T5745', '-v0'])
+test('T5745', [], multimod_compile_fail, ['T5745', '-v0'])
test('T5892a', normal, compile_fail, ['-package containers'])
test('T5892b', normal, compile_fail, ['-package containers'])
test('T5951', normal, compile_fail, [''])
@@ -117,9 +100,7 @@ test('T8149', normal, compile, [''])
test('RnStaticPointersFail01', [], compile_fail, [''])
test('RnStaticPointersFail02', [], compile_fail, [''])
test('RnStaticPointersFail03', [], compile_fail, ['-dsuppress-uniques'])
-test('T9006',
- extra_clean(['T9006a.hi', 'T9006a.o']),
- multimod_compile_fail, ['T9006', '-v0'])
+test('T9006', [], multimod_compile_fail, ['T9006', '-v0'])
test('T9156', normal, compile_fail, [''])
test('T9177', normal, compile_fail, [''])
test('T9177a', normal, compile_fail, [''])
diff --git a/testsuite/tests/roles/should_compile/all.T b/testsuite/tests/roles/should_compile/all.T
index 0ccaf11546..c0b0d827c9 100644
--- a/testsuite/tests/roles/should_compile/all.T
+++ b/testsuite/tests/roles/should_compile/all.T
@@ -6,4 +6,4 @@ test('Roles13', only_ways('normal'), compile, ['-ddump-simpl -dsuppress-uniques'
test('Roles14', only_ways('normal'), compile, ['-ddump-tc -dsuppress-uniques'])
test('T8958', [normalise_fun(normalise_errmsg), only_ways('normal')], compile, ['-ddump-tc -dsuppress-uniques -fprint-typechecker-elaboration'])
test('T10263', normal, compile, [''])
-test('T9204b', extra_clean(['T9204b.o-boot', 'T9204b.hi-boot', 'T9204b2.hi', 'T9204b2.o']), multimod_compile, ['T9204b', '-v0'])
+test('T9204b', [], multimod_compile, ['T9204b', '-v0'])
diff --git a/testsuite/tests/roles/should_fail/all.T b/testsuite/tests/roles/should_fail/all.T
index f01205e364..8e7d91b67f 100644
--- a/testsuite/tests/roles/should_fail/all.T
+++ b/testsuite/tests/roles/should_fail/all.T
@@ -4,10 +4,7 @@ test('Roles7', normal, compile_fail, [''])
test('Roles8', normal, compile_fail, [''])
test('Roles10', normal, compile_fail, [''])
test('Roles11', normal, compile_fail, [''])
-test('Roles12',
- extra_clean(['Roles12.o-boot', 'Roles12.hi-boot', 'Roles12a.o', 'Roles12a.hi']),
- run_command, ['$MAKE --no-print-directory -s Roles12'])
+test('Roles12', [], run_command, ['$MAKE --no-print-directory -s Roles12'])
test('T8773', normal, compile_fail, [''])
-test('T9204', extra_clean(['T9204.o-boot', 'T9204.hi-boot', 'T9204a.o', 'T9204a.hi-boot']),
- run_command, ['$MAKE --no-print-directory -s T9204'])
+test('T9204', [], run_command, ['$MAKE --no-print-directory -s T9204'])
test('RolesIArray', normal, compile_fail, [''])
diff --git a/testsuite/tests/rts/T10672/all.T b/testsuite/tests/rts/T10672/all.T
index 4367b0a497..4e06204b19 100644
--- a/testsuite/tests/rts/T10672/all.T
+++ b/testsuite/tests/rts/T10672/all.T
@@ -1,11 +1,7 @@
-test('T10672_x64', [extra_clean(['cxxy.o',
- 'Main.exe', 'Main.hi', 'Main.o',
- 'Printf.o', 'Printf.hi']),
- [unless(opsys('mingw32'),skip) , unless(arch('x86_64'), skip)]],
- run_command, ['$MAKE -s --no-print-directory T10672_x64'])
+test('T10672_x64',
+ [[unless(opsys('mingw32'), skip), unless(arch('x86_64'), skip)]],
+ run_command, ['$MAKE -s --no-print-directory T10672_x64'])
-test('T10672_x86', [extra_clean(['cxxy.o',
- 'Main.exe', 'Main.hi', 'Main.o',
- 'Printf.o', 'Printf.hi']),
- [unless(opsys('mingw32'),skip) , unless(arch('i386'), skip)]],
- run_command, ['$MAKE -s --no-print-directory T10672_x86'])
+test('T10672_x86',
+ [[unless(opsys('mingw32'), skip), unless(arch('i386'), skip)]],
+ run_command, ['$MAKE -s --no-print-directory T10672_x86'])
diff --git a/testsuite/tests/rts/T12031/all.T b/testsuite/tests/rts/T12031/all.T
index 5e1a0a886f..abff4472e4 100644
--- a/testsuite/tests/rts/T12031/all.T
+++ b/testsuite/tests/rts/T12031/all.T
@@ -1,5 +1,4 @@
-test('T12031', [ extra_clean(['bar.o', 'baz.o', 'ExternBug.o'])
- , extra_files(['bar.c', 'baz.c', 'ExternBug.hs', 'foo.h'])
- , unless(opsys('mingw32'), skip)
- ],
- run_command, ['$MAKE -s --no-print-directory T12031'])
+test('T12031',
+ [extra_files(['bar.c', 'baz.c', 'ExternBug.hs', 'foo.h']),
+ unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory T12031'])
diff --git a/testsuite/tests/rts/T12771/all.T b/testsuite/tests/rts/T12771/all.T
index 50933d5e67..f38eda25e0 100644
--- a/testsuite/tests/rts/T12771/all.T
+++ b/testsuite/tests/rts/T12771/all.T
@@ -1,5 +1,4 @@
-test('T12771', [ extra_clean(['libfoo.a', 'libfoo-1.dll', 'foo.o', 'main.o'])
- , extra_files(['foo.c', 'main.hs', 'foo_dll.c'])
- , unless(opsys('mingw32'), skip)
- ],
- run_command, ['$MAKE -s --no-print-directory T12771'])
+test('T12771',
+ [extra_files(['foo.c', 'main.hs', 'foo_dll.c']),
+ unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory T12771'])
diff --git a/testsuite/tests/rts/T13082/all.T b/testsuite/tests/rts/T13082/all.T
index dd94766c48..f048ce4ddd 100644
--- a/testsuite/tests/rts/T13082/all.T
+++ b/testsuite/tests/rts/T13082/all.T
@@ -1,11 +1,7 @@
-test('T13082_good', [ extra_clean(['libfoo.a', 'libfoo-1.dll', 'foo.o', 'main.o'])
- , extra_files(['foo.c', 'main.hs', 'foo_dll.c'])
- , unless(opsys('mingw32'), skip)
- ],
- run_command, ['$MAKE -s --no-print-directory T13082_good'])
+test('T13082_good',
+ [extra_files(['foo.c', 'main.hs', 'foo_dll.c']),
+ unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory T13082_good'])
-test('T13082_fail', [ extra_clean(['main.o'])
- , extra_files(['main.hs'])
- , unless(opsys('mingw32'), skip)
- ],
- run_command, ['$MAKE -s --no-print-directory T13082_fail'])
+test('T13082_fail', [extra_files(['main.hs']), unless(opsys('mingw32'), skip)],
+ run_command, ['$MAKE -s --no-print-directory T13082_fail'])
diff --git a/testsuite/tests/rts/T7289/all.T b/testsuite/tests/rts/T7289/all.T
index 7ef59cc8aa..7fec82a610 100644
--- a/testsuite/tests/rts/T7289/all.T
+++ b/testsuite/tests/rts/T7289/all.T
@@ -1,6 +1,4 @@
-test('T7289', [ extra_clean(['fp.o', 'testfp.o', 'testfp.hi'])
- , extra_files(['fp.c'])
- , unless(opsys('mingw32'), skip)
- , only_ways(['threaded1'])
- ],
- compile_and_run, ['fp.c'])
+test('T7289',
+ [extra_files(['fp.c']), unless(opsys('mingw32'), skip),
+ only_ways(['threaded1'])],
+ compile_and_run, ['fp.c'])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 14f0cec295..2fae73ccf4 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -128,18 +128,14 @@ test('traceEvent', [ omit_ways(['dyn'] + prof_ways),
extra_run_opts('+RTS -ls -RTS') ],
compile_and_run, ['-eventlog'])
-test('T4059',
- extra_clean(['T4059_c.o']),
- run_command,
- ['$MAKE -s --no-print-directory T4059'])
+test('T4059', [], run_command, ['$MAKE -s --no-print-directory T4059'])
# Test for #4274
-test('exec_signals', [
- when(opsys('mingw32'), skip),
- pre_cmd('$MAKE -s --no-print-directory exec_signals-prep'),
- cmd_prefix('./exec_signals_prepare'),
- extra_clean(['exec_signals_child', 'exec_signals_prepare'])
- ], compile_and_run, [''])
+test('exec_signals',
+ [when(opsys('mingw32'), skip),
+ pre_cmd('$MAKE -s --no-print-directory exec_signals-prep'),
+ cmd_prefix('./exec_signals_prepare')],
+ compile_and_run, [''])
test('return_mem_to_os', normal, compile_and_run, [''])
@@ -158,10 +154,7 @@ test('T5250', [ config_T5250,
omit_ways(['ghci']) ],
compile_and_run, ['spalign.c'])
-test('T5423',
- extra_clean(['T5423_cmm.o']),
- run_command,
- ['$MAKE -s --no-print-directory T5423'])
+test('T5423', [], run_command, ['$MAKE -s --no-print-directory T5423'])
# Workaround bug #8458: old dlopen opens sections in the wrong order,
# so we just accept both orders.
@@ -204,25 +197,20 @@ test('T6006', [ omit_ways(prof_ways + ['ghci']),
# needs it.
compile_and_run, ['T6006_c.c -no-hs-main'])
-test('T7037',
- [ extra_clean(['T7037_main.o','T7037_main'])],
- run_command,
- ['$MAKE -s --no-print-directory T7037'])
+test('T7037', [], run_command, ['$MAKE -s --no-print-directory T7037'])
test('T7087', exit_code(1), compile_and_run, [''])
test('T7160', normal, compile_and_run, [''])
-test('T7040', [ extra_clean(['T7040_c.o']), omit_ways(['ghci']) ],
- compile_and_run, ['T7040_c.c'])
+test('T7040', [omit_ways(['ghci'])], compile_and_run, ['T7040_c.c'])
-test('T7040_ghci', [ only_ways(['ghci']),
- pre_cmd('$MAKE -s --no-print-directory T7040_ghci_setup'),
- extra_clean(['T7040_ghci_c.o']) ],
- compile_and_run, ['T7040_ghci_c.o'])
+test('T7040_ghci',
+ [only_ways(['ghci']),
+ pre_cmd('$MAKE -s --no-print-directory T7040_ghci_setup')],
+ compile_and_run, ['T7040_ghci_c.o'])
-test('T7227', [ extra_run_opts('+RTS -tT7227.stat --machine-readable -RTS'),
- extra_clean(['T7227.stat']) ]
- , compile_and_run, [''] )
+test('T7227', [extra_run_opts('+RTS -tT7227.stat --machine-readable -RTS')],
+ compile_and_run, [''])
test('T7636', [ exit_code(1), extra_run_opts('100000') ], compile_and_run, [''] )
@@ -240,18 +228,14 @@ test('T7815', [ multi_cpu_race,
test('ffishutdown', [ignore_stderr, only_ways(['threaded1','threaded2'])],
compile_and_run, [''])
-test('T7919',
- [extra_clean(['T7919A.o','T7919A.hi', 'T7919A.dyn_o','T7919A.dyn_hi']),
- when(fast(), skip), omit_ways(prof_ways)],
- compile_and_run, [config.ghc_th_way_flags])
+test('T7919', [when(fast(), skip), omit_ways(prof_ways)], compile_and_run,
+ [config.ghc_th_way_flags])
test('T8035', normal, compile_and_run, [''])
test('linker_unload',
- [ when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)),
- extra_clean(['Test.o','Test.hi', 'linker_unload']) ],
- run_command,
- ['$MAKE -s --no-print-directory linker_unload'])
+ [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))],
+ run_command, ['$MAKE -s --no-print-directory linker_unload'])
test('T8209', [ req_smp, only_ways(threaded_ways), ignore_stdout ],
compile_and_run, [''])
@@ -298,21 +282,13 @@ test('overflow1', [ exit_code(251) ], compile_and_run, [''])
test('overflow2', [ exit_code(251) ], compile_and_run, [''])
test('overflow3', [ exit_code(251) ], compile_and_run, [''])
-test('linker_error1',
- [ extra_clean(['linker_error1.o','linker_error1']), ignore_stderr ],
- run_command,
+test('linker_error1', [ignore_stderr], run_command,
['$MAKE -s --no-print-directory linker_error1'])
-test('linker_error2',
- [ extra_clean(['linker_error2.o','linker_error2_c.o', 'linker_error2']),
- ignore_stderr ],
- run_command,
+test('linker_error2', [ignore_stderr], run_command,
['$MAKE -s --no-print-directory linker_error2'])
-test('linker_error3',
- [ extra_clean(['linker_error3.o','linker_error3_c.o', 'linker_error3']),
- ignore_stderr ],
- run_command,
+test('linker_error3', [ignore_stderr], run_command,
['$MAKE -s --no-print-directory linker_error3'])
def grep_stderr(pattern):
@@ -363,15 +339,14 @@ test('T10904', [ omit_ways(['ghci']), extra_run_opts('20000') ],
test('T10728', [extra_run_opts('+RTS -maxN3 -RTS'), only_ways(['threaded2'])],
compile_and_run, [''])
-test('T9405', [extra_clean(['T9405.ticky']), when(msys(), expect_broken(12714))],
- run_command, ['$MAKE -s --no-print-directory T9405'])
+test('T9405', [when(msys(), expect_broken(12714))], run_command,
+ ['$MAKE -s --no-print-directory T9405'])
test('T11788', when(ghc_dynamic(), skip),
run_command, ['$MAKE -s --no-print-directory T11788'])
-test('T10296a', [ req_smp, extra_clean(['T10296a.o','T10296a_c.o','T10296a'])],
- run_command,
- ['$MAKE -s --no-print-directory T10296a'])
+test('T10296a', [req_smp], run_command,
+ ['$MAKE -s --no-print-directory T10296a'])
test('T10296b', [only_ways('threaded2')], compile_and_run, [''])
diff --git a/testsuite/tests/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T
index fb2841b73c..a4ac4b46cd 100644
--- a/testsuite/tests/safeHaskell/check/all.T
+++ b/testsuite/tests/safeHaskell/check/all.T
@@ -8,9 +8,7 @@ def f( name, opts ):
setTestOpts(f)
test('CheckA', normal, compile, [''])
-test('CheckB',
- extra_clean(['CheckB_Aux.hi', 'CheckB_Aux.o']),
- multimod_compile, ['CheckB', '-trust base'])
+test('CheckB', [], multimod_compile, ['CheckB', '-trust base'])
# fail as we don't trust base when compiling Check01
test('Check01', normal, multi_compile_fail, ['Check01 -distrust base', [
@@ -43,19 +41,13 @@ test('Check04', normal, multi_compile, ['Check04', [
test('Check05', normal, compile, [''])
# Check safe-infered modules have correct pkg trust requirements
-test('Check06',
- extra_clean(['Check06_A.hi', 'Check06_A.o']),
- multimod_compile_fail, ['Check06', ''])
+test('Check06', [], multimod_compile_fail, ['Check06', ''])
# Check selective safe imports bring in correct pkg trust requirements
-test('Check07',
- extra_clean(['Check07_A.hi', 'Check07_A.o', 'Check07_B.hi', 'Check07_B.o']),
- multimod_compile, ['Check07', ''])
+test('Check07', [], multimod_compile, ['Check07', ''])
# Check selective safe imports bring in correct pkg trust requirements
-test('Check08',
- extra_clean(['Check08_A.hi', 'Check08_A.o', 'Check08_B.hi', 'Check08_B.o']),
- multimod_compile_fail, ['Check08', ''])
+test('Check08', [], multimod_compile_fail, ['Check08', ''])
# check -distrust-all-packages flag works
test('Check09',
diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index 49e4ec20f1..cd89b88ce2 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
@@ -27,13 +27,10 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn
# Test building a package, that trust values are set correctly
# and can be changed correctly
test('safePkg01',
- [clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.safePkg01'),
- normalise_errmsg_fun(ignoreLdOutput),
+ [normalise_errmsg_fun(ignoreLdOutput),
normalise_version("array", "integer-gmp", "integer-simple", "bytestring",
- "base", "deepseq", "ghc-prim"),
- ],
- run_command,
- ['$MAKE -s --no-print-directory safePkg01 ' + make_args])
+ "base", "deepseq", "ghc-prim")],
+ run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args])
# Fail since we enable package trust
test('ImpSafe01', normal, compile_fail, ['-fpackage-trust -distrust base'])
@@ -53,67 +50,55 @@ test('ImpSafe03',
test('ImpSafe04', normal, compile_fail, ['-fpackage-trust -distrust base'])
test('ImpSafeOnly01',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly01')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args)],
compile,
['-fpackage-trust -package-db pdb.ImpSafeOnly01/local.db -trust base'])
test('ImpSafeOnly02',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly02')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args)],
compile,
['-fpackage-trust -package-db pdb.ImpSafeOnly02/local.db -trust base -trust safePkg01'])
# Fail since we enable package trust (and still need safePkg01 trusted)
test('ImpSafeOnly03',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly03')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args)],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly03/local.db -trust base'])
# Succeed since we don't enable package trust
test('ImpSafeOnly04',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly04')],
- compile,
- ['-package-db pdb.ImpSafeOnly04/local.db -trust base'])
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args)],
+ compile, ['-package-db pdb.ImpSafeOnly04/local.db -trust base'])
# fail due to missing trust of safePkg01, next test succeeds.
test('ImpSafeOnly05',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly05')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args)],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly05/local.db -trust base'])
test('ImpSafeOnly06',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly06')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args)],
compile,
['-fpackage-trust -package-db pdb.ImpSafeOnly06/local.db -trust base -trust safePkg01'])
# fail due to missing trust
test('ImpSafeOnly07',
[pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly07 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly07'),
normalise_version("bytestring", "base")],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly07/local.db -trust safePkg01 -distrust bytestring'])
test('ImpSafeOnly08',
[pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly08 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly08'),
normalise_version("bytestring", "base")],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly08/local.db -trust safePkg01'])
test('ImpSafeOnly09',
[pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly09 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly09'),
normalise_version("bytestring")],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly09/local.db -trust safePkg01'])
# finally succeed
test('ImpSafeOnly10',
- [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args),
- clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly10')],
+ [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args)],
compile,
['-fpackage-trust -package-db pdb.ImpSafeOnly10/local.db -trust safePkg01 -trust base -trust bytestring'])
-
diff --git a/testsuite/tests/safeHaskell/overlapping/all.T b/testsuite/tests/safeHaskell/overlapping/all.T
index c253850ac1..593a154c85 100644
--- a/testsuite/tests/safeHaskell/overlapping/all.T
+++ b/testsuite/tests/safeHaskell/overlapping/all.T
@@ -6,57 +6,24 @@ def f( name, opts ):
setTestOpts(f)
-test('SH_Overlap1',
- [ extra_clean(['SH_Overlap1_A.hi', 'SH_Overlap1_A.o',
- 'SH_Overlap1_B.hi', 'SH_Overlap1_B.o']) ],
- multimod_compile_fail, ['SH_Overlap1', ''])
-
-test('SH_Overlap2',
- [ extra_clean(['SH_Overlap2_A.hi', 'SH_Overlap2_A.o',
- 'SH_Overlap2_B.hi', 'SH_Overlap2_B.o']) ],
- multimod_compile_fail, ['SH_Overlap2', ''])
-
-test('SH_Overlap3',
- [ extra_clean(['SH_Overlap3_A.hi', 'SH_Overlap3_A.o',
- 'SH_Overlap3_B.hi', 'SH_Overlap3_B.o']) ],
- multimod_compile, ['SH_Overlap3', ''])
-
-test('SH_Overlap4',
- [ extra_clean(['SH_Overlap4_A.hi', 'SH_Overlap4_A.o',
- 'SH_Overlap4_B.hi', 'SH_Overlap4_B.o']) ],
- multimod_compile, ['SH_Overlap4', ''])
-
-test('SH_Overlap5',
- [ extra_clean(['SH_Overlap5_A.hi', 'SH_Overlap5_A.o',
- 'SH_Overlap5_B.hi', 'SH_Overlap5_B.o']) ],
- multimod_compile_fail, ['SH_Overlap5', ''])
-
-test('SH_Overlap6',
- [ extra_clean(['SH_Overlap6_A.hi', 'SH_Overlap6_A.o',
- 'SH_Overlap6_B.hi', 'SH_Overlap6_B.o']) ],
- multimod_compile_fail, ['SH_Overlap6', ''])
-
-test('SH_Overlap7',
- [ extra_clean(['SH_Overlap7_A.hi', 'SH_Overlap7_A.o',
- 'SH_Overlap7_B.hi', 'SH_Overlap7_B.o']) ],
- multimod_compile_fail, ['SH_Overlap7', '-Werror'])
-
-test('SH_Overlap8',
- [ extra_clean(['SH_Overlap8_A.hi', 'SH_Overlap8_A.o']) ],
- multimod_compile, ['SH_Overlap8', ''])
-
-test('SH_Overlap9',
- [ extra_clean(['SH_Overlap9_A.hi', 'SH_Overlap9_A.o',
- 'SH_Overlap9_B.hi', 'SH_Overlap9_B.o']) ],
- multimod_compile, ['SH_Overlap9', '-Werror'])
-
-test('SH_Overlap10',
- [ extra_clean(['SH_Overlap10_A.hi', 'SH_Overlap10_A.o',
- 'SH_Overlap10_B.hi', 'SH_Overlap10_B.o']) ],
- multimod_compile, ['SH_Overlap10', '-Werror'])
-
-test('SH_Overlap11',
- [ extra_clean(['SH_Overlap11_A.hi', 'SH_Overlap11_A.o',
- 'SH_Overlap11_B.hi', 'SH_Overlap11_B.o']) ],
- multimod_compile, ['SH_Overlap11', ''])
+test('SH_Overlap1', [], multimod_compile_fail, ['SH_Overlap1', ''])
+test('SH_Overlap2', [], multimod_compile_fail, ['SH_Overlap2', ''])
+
+test('SH_Overlap3', [], multimod_compile, ['SH_Overlap3', ''])
+
+test('SH_Overlap4', [], multimod_compile, ['SH_Overlap4', ''])
+
+test('SH_Overlap5', [], multimod_compile_fail, ['SH_Overlap5', ''])
+
+test('SH_Overlap6', [], multimod_compile_fail, ['SH_Overlap6', ''])
+
+test('SH_Overlap7', [], multimod_compile_fail, ['SH_Overlap7', '-Werror'])
+
+test('SH_Overlap8', [], multimod_compile, ['SH_Overlap8', ''])
+
+test('SH_Overlap9', [], multimod_compile, ['SH_Overlap9', '-Werror'])
+
+test('SH_Overlap10', [], multimod_compile, ['SH_Overlap10', '-Werror'])
+
+test('SH_Overlap11', [], multimod_compile, ['SH_Overlap11', ''])
diff --git a/testsuite/tests/safeHaskell/safeInfered/all.T b/testsuite/tests/safeHaskell/safeInfered/all.T
index def025049e..c51a0abcce 100644
--- a/testsuite/tests/safeHaskell/safeInfered/all.T
+++ b/testsuite/tests/safeHaskell/safeInfered/all.T
@@ -8,53 +8,24 @@ def f( name, opts ):
setTestOpts(f)
# Tests that should compile fine as they should be infered safe
-test('SafeInfered01',
- [ extra_clean(['SafeInfered01_A.hi', 'SafeInfered01_A.o']) ],
- multimod_compile, ['SafeInfered01', ''])
-test('SafeInfered02',
- [ extra_clean(['SafeInfered02_A.hi', 'SafeInfered02_A.o']) ],
- multimod_compile, ['SafeInfered02', ''])
-test('SafeInfered03',
- [ extra_clean(['SafeInfered03_A.hi', 'SafeInfered03_A.o']) ],
- multimod_compile, ['SafeInfered03', ''])
-test('SafeInfered04',
- [ extra_clean(['SafeInfered04_A.hi', 'SafeInfered04_A.o']) ],
- multimod_compile, ['SafeInfered04', ''])
-test('SafeInfered05',
- [ extra_clean(['SafeInfered05_A.hi', 'SafeInfered05_A.o']) ],
- multimod_compile, ['SafeInfered05', ''])
+test('SafeInfered01', [], multimod_compile, ['SafeInfered01', ''])
+test('SafeInfered02', [], multimod_compile, ['SafeInfered02', ''])
+test('SafeInfered03', [], multimod_compile, ['SafeInfered03', ''])
+test('SafeInfered04', [], multimod_compile, ['SafeInfered04', ''])
+test('SafeInfered05', [], multimod_compile, ['SafeInfered05', ''])
# Tests that should fail to compile as they should be infered unsafe
-test('UnsafeInfered01',
- [ extra_clean(['UnsafeInfered01_A.hi', 'UnsafeInfered01_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered01', ''])
-test('UnsafeInfered02',
- [ extra_clean(['UnsafeInfered02_A.hi', 'UnsafeInfered02_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered02', ''])
-test('UnsafeInfered03',
- [ extra_clean(['UnsafeInfered03_A.hi', 'UnsafeInfered03_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered03', ''])
-test('UnsafeInfered05',
- [ extra_clean(['UnsafeInfered05_A.hi', 'UnsafeInfered05_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered05', ''])
-test('UnsafeInfered06',
- [ extra_clean(['UnsafeInfered06_A.hi', 'UnsafeInfered06_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered06', ''])
-test('UnsafeInfered08',
- [ extra_clean(['UnsafeInfered08_A.hi', 'UnsafeInfered08_A.o']) ],
- multimod_compile, ['UnsafeInfered08', ''])
-test('UnsafeInfered09',
- [ extra_clean(['UnsafeInfered09_A.hi', 'UnsafeInfered09_A.o',
- 'UnsafeInfered09_B.hi', 'UnsafeInfered09_B.o']) ],
- multimod_compile_fail, ['UnsafeInfered09', ''])
+test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', ''])
+test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', ''])
+test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', ''])
+test('UnsafeInfered05', [], multimod_compile_fail, ['UnsafeInfered05', ''])
+test('UnsafeInfered06', [], multimod_compile_fail, ['UnsafeInfered06', ''])
+test('UnsafeInfered08', [], multimod_compile, ['UnsafeInfered08', ''])
+test('UnsafeInfered09', [], multimod_compile_fail, ['UnsafeInfered09', ''])
# Test that should fail as we disable safe inference
-test('UnsafeInfered10',
- [ extra_clean(['UnsafeInfered10_A.hi', 'UnsafeInfered10_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered10', ''])
-test('UnsafeInfered11',
- [ extra_clean(['UnsafeInfered11_A.hi', 'UnsafeInfered11_A.o']) ],
- multimod_compile_fail, ['UnsafeInfered11', ''])
+test('UnsafeInfered10', [], multimod_compile_fail, ['UnsafeInfered10', ''])
+test('UnsafeInfered11', [], multimod_compile_fail, ['UnsafeInfered11', ''])
# Test TH is unsafe
test('UnsafeInfered12', normal, compile_fail, [''])
diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T
index 8dad0efee6..a8a1bc0d7b 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/all.T
+++ b/testsuite/tests/safeHaskell/safeLanguage/all.T
@@ -21,35 +21,15 @@ test('SafeLang05', normal, compile_and_run, [''])
test('SafeLang07', normal, compile_fail, [''])
test('SafeLang08', normal, compile_fail, [''])
-test('SafeLang09',
- [exit_code(1),
- extra_clean(['SafeLang09_A.o', 'SafeLang09_A.hi',
- 'SafeLang09_B.o', 'SafeLang09_B.hi'])],
- compile_and_run,
- [''])
-test('SafeLang10',
- extra_clean(['SafeLang10_A.o', 'SafeLang10_A.hi',
- 'SafeLang10_B.o', 'SafeLang10_B.hi']),
- multimod_compile_fail,
- ['SafeLang10', ''])
-test('SafeLang11',
- [req_interp,
- extra_clean(['SafeLang11_A.o', 'SafeLang11_A.hi',
- 'SafeLang11_B.o', 'SafeLang11_B.hi'])],
- multimod_compile_and_run,
+test('SafeLang09', [exit_code(1)], compile_and_run, [''])
+test('SafeLang10', [], multimod_compile_fail, ['SafeLang10', ''])
+test('SafeLang11', [req_interp], multimod_compile_and_run,
['SafeLang11', config.ghc_th_way_flags])
test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', ''])
-test('SafeLang15',
- [exit_code(1),
- extra_clean(['SafeLang15_A.o', 'SafeLang15_A.hi'])],
- multimod_compile_and_run,
+test('SafeLang15', [exit_code(1)], multimod_compile_and_run,
['SafeLang15', '-XSafe'])
test('SafeLang16', normal, compile, [''])
-test('SafeLang17',
- extra_clean(['SafeLang17_A.o', 'SafeLang17_A.hi',
- 'SafeLang17_B.o', 'SafeLang17_B.hi']),
- multimod_compile_fail,
- ['SafeLang17', ''])
+test('SafeLang17', [], multimod_compile_fail, ['SafeLang17', ''])
test('SafeLang18', normal, compile, [''])
diff --git a/testsuite/tests/simplCore/T9646/test.T b/testsuite/tests/simplCore/T9646/test.T
index b2292c12fb..81562ec086 100644
--- a/testsuite/tests/simplCore/T9646/test.T
+++ b/testsuite/tests/simplCore/T9646/test.T
@@ -1,10 +1,3 @@
-test('T9646',
- [when(fast(), skip),
- expect_broken_for(9646, ['ghci']),
- extra_clean(['Main.hi', 'Main.o', 'Main.dump-simpl',
- 'Natural.dump-simpl', 'StrictPrim.dump-simpl',
- 'Type.dump-simpl'])],
- multimod_compile_and_run,
- ['Main -ddump-simpl -ddump-to-file', ''])
-
+test('T9646', [when(fast(), skip), expect_broken_for(9646, ['ghci'])],
+ multimod_compile_and_run, ['Main -ddump-simpl -ddump-to-file', ''])
diff --git a/testsuite/tests/simplCore/prog001/test.T b/testsuite/tests/simplCore/prog001/test.T
index bfe2dcfaa3..21e66b25f5 100644
--- a/testsuite/tests/simplCore/prog001/test.T
+++ b/testsuite/tests/simplCore/prog001/test.T
@@ -1,5 +1 @@
-test('simplCore.prog001',
- extra_clean(['Simpl006Help.hi', 'Simpl006Help.o',
- 'simpl006.hi', 'simpl006.o']),
- multimod_compile,
- ['simpl006', '-v0'])
+test('simplCore.prog001', [], multimod_compile, ['simpl006', '-v0'])
diff --git a/testsuite/tests/simplCore/prog002/test.T b/testsuite/tests/simplCore/prog002/test.T
index 1394874e16..7fdd83cc1f 100644
--- a/testsuite/tests/simplCore/prog002/test.T
+++ b/testsuite/tests/simplCore/prog002/test.T
@@ -1,5 +1 @@
-test('simplCore.prog002',
- extra_clean(['Simpl009Help.hi', 'Simpl009Help.o',
- 'simpl009.hi', 'simpl009.o']),
- multimod_compile,
- ['simpl009', '-v0'])
+test('simplCore.prog002', [], multimod_compile, ['simpl009', '-v0'])
diff --git a/testsuite/tests/simplCore/prog003/test.T b/testsuite/tests/simplCore/prog003/test.T
index 387bd20508..c2d9ec5615 100644
--- a/testsuite/tests/simplCore/prog003/test.T
+++ b/testsuite/tests/simplCore/prog003/test.T
@@ -1,7 +1,2 @@
-test('simplCore.oneShot',
- [ only_ways(['optasm']),
- extra_clean(['OneShot1.hi', 'OneShot1.o',
- 'OneShot2.hi', 'OneShot2.o']),
- ],
- multimod_compile_and_run,
+test('simplCore.oneShot', [only_ways(['optasm'])], multimod_compile_and_run,
['OneShot2', '-v0'])
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 2ede2468ee..8bd7cdd350 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -19,10 +19,7 @@ test('simpl016', normal, compile, ['-dsuppress-uniques'])
test('simpl017', normal, compile_fail, [''])
test('simpl018', normal, compile, [''])
test('simpl019', normal, compile, [''])
-test('simpl020',
- extra_clean(['Simpl020_A.hi', 'Simpl020_A.o']),
- multimod_compile,
- ['simpl020', '-v0'])
+test('simpl020', [], multimod_compile, ['simpl020', '-v0'])
test('simpl-T1370', normal, compile, [''])
test('T2520', normal, compile, [''])
@@ -67,10 +64,7 @@ test('T4930', only_ways(['optasm']),
compile,
['-O -ddump-simpl -dsuppress-uniques'])
-test('T3055',
- extra_clean(['T3055.hi', 'T3055.o', 'T3055.simpl']),
- run_command,
- ['$MAKE -s --no-print-directory T3055'])
+test('T3055', [], run_command, ['$MAKE -s --no-print-directory T3055'])
test('T4306',
normal,
@@ -96,15 +90,9 @@ test('T3831', normal, compile, [''])
test('T4345', normal, compile, [''])
test('T4398', normal, compile, ['-dsuppress-uniques'])
-test('T4903',
- extra_clean(['T4903a.hi', 'T4903a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T4903'])
+test('T4903', [], run_command, ['$MAKE -s --no-print-directory T4903'])
-test('T4918',
- extra_clean(['T4918a.hi', 'T4918a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T4918'])
+test('T4918', [], run_command, ['$MAKE -s --no-print-directory T4918'])
# This test flips too and fro about whether it passes
# I'm not sure why it is so delicate, but it greps the
@@ -131,11 +119,7 @@ test('T5342', normal, compile, ['']) # Lint error with -prof
test('T5359a', normal, compile, ['']) # Lint error with -O (OccurAnal)
test('T5359b', normal, compile, ['']) # Lint error with -O (OccurAnal)
test('T5458', normal, compile, [''])
-test('simpl021',
- extra_clean(['Simpl021A.hi', 'Simpl021A.o',
- 'Simpl021B.hi', 'Simpl021B.o']),
- run_command,
- ['$MAKE -s --no-print-directory simpl021'])
+test('simpl021', [], run_command, ['$MAKE -s --no-print-directory simpl021'])
test('T5327', normal, run_command, ['$MAKE -s --no-print-directory T5327'])
test('T5615', normal, run_command, ['$MAKE -s --no-print-directory T5615'])
test('T5623', normal, run_command, ['$MAKE -s --no-print-directory T5623'])
@@ -148,26 +132,17 @@ test('T5776',
normal,
run_command,
['$MAKE -s --no-print-directory T5776'])
-test('T4138',
- extra_clean(['T4138_A.hi', 'T4138_A.o', 'T4138.simpl']),
- run_command,
- ['$MAKE -s --no-print-directory T4138'])
+test('T4138', [], run_command, ['$MAKE -s --no-print-directory T4138'])
test('T7088', normal, compile, [''])
test('T6082-RULE', normal, compile, [''])
-test('T7165',
- extra_clean(['T7165a.hi', 'T7165a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T7165'])
+test('T7165', [], run_command, ['$MAKE -s --no-print-directory T7165'])
test('T7287', normal, compile, [''])
test('T7360', only_ways(['optasm']), compile, ['-ddump-simpl -dsuppress-uniques'])
test('T5366',
normal,
run_command,
['$MAKE -s --no-print-directory T5366'])
-test('T7796',
- extra_clean(['T7796.prep']),
- run_command,
- ['$MAKE -s --no-print-directory T7796'])
+test('T7796', [], run_command, ['$MAKE -s --no-print-directory T7796'])
test('T5550', omit_ways(prof_ways), compile, [''])
test('T7865', normal, run_command, ['$MAKE -s --no-print-directory T7865'])
test('T7785', only_ways(['optasm']), compile, ['-ddump-rules'])
@@ -192,10 +167,7 @@ test('T7995',
test('T8196', normal, compile, [''])
test('T8221b', normal, compile, [''])
-test('T8221',
- extra_clean(['T8221a.hi', 'T8221a.o']),
- run_command,
- ['$MAKE -s --no-print-directory T8221'])
+test('T8221', [], run_command, ['$MAKE -s --no-print-directory T8221'])
test('T8274', normal, run_command, ['$MAKE -s --no-print-directory T8274'])
test('T8329', only_ways(['optasm']), multimod_compile, ['T8329','-v0 -O'])
test('T5996',
@@ -239,7 +211,7 @@ test('T3990',
run_command,
['$MAKE -s --no-print-directory T3990'])
-test('T12076', extra_clean(['T12076a.hi', 'T12076a.o']), multimod_compile, ['T12076', '-v0'])
+test('T12076', [], multimod_compile, ['T12076', '-v0'])
test('T12076lit', normal, compile, ['-O'])
test('T12076sat', normal, compile, ['-O'])
test('T12212', normal, compile, ['-O'])
diff --git a/testsuite/tests/simplCore/should_run/all.T b/testsuite/tests/simplCore/should_run/all.T
index 733f158b12..68a516ef8a 100644
--- a/testsuite/tests/simplCore/should_run/all.T
+++ b/testsuite/tests/simplCore/should_run/all.T
@@ -40,17 +40,12 @@ test('T4814', normal, compile_and_run, [''])
# Run this test *without* optimisation too
test('T3959', only_ways(['normal','optasm']), compile_and_run, [''])
-test('T3983', [only_ways(['normal','optasm']),
- extra_clean(['T3983_Foo.hi','T3983_Foo.o','T3983_Bar.hi','T3983_Bar.o',])],
- multimod_compile_and_run,
- ['T3983',''])
-test('T3972', extra_clean(['T3972A.hi', 'T3972A.o']),
- compile_and_run,
- [''])
+test('T3983', [only_ways(['normal', 'optasm'])], multimod_compile_and_run,
+ ['T3983', ''])
+test('T3972', [], compile_and_run, [''])
test('T5315', normal, compile_and_run, [''])
test('T5453', normal, compile_and_run, [''])
-test('T5441', extra_clean(['T5441a.o','T5441a.hi']),
- multimod_compile_and_run, ['T5441',''])
+test('T5441', [], multimod_compile_and_run, ['T5441', ''])
test('T5603', normal, compile_and_run, [''])
test('T2110', normal, compile_and_run, [''])
test('AmapCoerce', normal, compile_and_run, [''])
diff --git a/testsuite/tests/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T
index 6cd9da4114..5bbbfd5e55 100644
--- a/testsuite/tests/stranal/should_compile/all.T
+++ b/testsuite/tests/stranal/should_compile/all.T
@@ -31,7 +31,7 @@ test('newtype', req_profiling, compile, ['-prof -fprof-auto'])
test('T1988', normal, compile, [''])
test('T8467', normal, compile, [''])
test('T8037', normal, compile, [''])
-test('T8743', [ extra_clean(['T8743.o-boot', 'T8743a.hi', 'T8743a.o', 'T8743.hi-boot']) ], multimod_compile, ['T8743', '-v0'])
+test('T8743', [], multimod_compile, ['T8743', '-v0'])
# T10482
# The intent here is to check that $wfoo has type
diff --git a/testsuite/tests/th/T2014/all.T b/testsuite/tests/th/T2014/all.T
index 5dd92919a6..7b190afaba 100644
--- a/testsuite/tests/th/T2014/all.T
+++ b/testsuite/tests/th/T2014/all.T
@@ -1,6 +1,2 @@
-test('T2014',
- [req_interp,
- extra_clean(['A.hi-boot','A.hi','A.o','A.o-boot',
- 'B.hi', 'B.o', 'C.hi', 'C.o'])],
- run_command,
+test('T2014', [req_interp], run_command,
['$MAKE -s --no-print-directory T2014'])
diff --git a/testsuite/tests/th/TH_import_loop/TH_import_loop.T b/testsuite/tests/th/TH_import_loop/TH_import_loop.T
index 770c75c0c8..d6f52b75cc 100644
--- a/testsuite/tests/th/TH_import_loop/TH_import_loop.T
+++ b/testsuite/tests/th/TH_import_loop/TH_import_loop.T
@@ -1,8 +1,3 @@
-test('TH_import_loop',
- [extra_clean(['ModuleA.o-boot', 'ModuleA.hi-boot',
- 'ModuleC.o', 'ModuleC.hi']),
- expect_broken(1012)],
- multimod_compile_and_run,
+test('TH_import_loop', [expect_broken(1012)], multimod_compile_and_run,
['Main', '-v0'])
-
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index cc9fa4dc96..71ab096bc8 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -25,24 +25,18 @@ test('TH_repPrimOutput', normal, compile_and_run, [''])
test('TH_repPrimOutput2', normal, compile_and_run, [''])
test('TH_repGuard', normal, compile, ['-v0'])
test('TH_repGuardOutput', normal, compile_and_run, [''])
-test('TH_repPatSig',
- extra_clean(['TH_repPatSig_asserts.hi', 'TH_repPatSig_asserts.o']),
- multimod_compile,
+test('TH_repPatSig', [], multimod_compile,
['TH_repPatSig.hs', '-v0 ' + config.ghc_th_way_flags])
test('TH_repPatSigTVar', normal, compile_fail, ['-v0'])
test('TH_overlaps', normal, compile, ['-v0'])
-test('TH_spliceE5',
- extra_clean(['TH_spliceE5_Lib.hi', 'TH_spliceE5_Lib.o']),
- multimod_compile_and_run,
+test('TH_spliceE5', [], multimod_compile_and_run,
['TH_spliceE5.hs', '-v0 ' + config.ghc_th_way_flags])
test('TH_spliceE6', normal, compile, ['-v0'])
-test('TH_NestedSplices',
- extra_clean(['TH_NestedSplices_Lib.hi', 'TH_NestedSplices_Lib.o']),
- multimod_compile,
+test('TH_NestedSplices', [], multimod_compile,
['TH_NestedSplices.hs', '-v0 ' + config.ghc_th_way_flags])
# Testing profiling with TH is a bit tricky (when not using
@@ -52,33 +46,17 @@ test('TH_NestedSplices',
# profiling w/ TH. Furthermore we must have built the program the
# normal way first, which is why the work is done by a Makefile rule.
test('TH_spliceE5_prof',
- [req_profiling,
- only_ways(['normal']),
- when(ghc_dynamic(), expect_broken(11495)),
- extra_clean(['TH_spliceE5_prof_Lib.p.o', 'TH_spliceE5_prof_Lib.hi',
- 'TH_spliceE5_prof_Lib.dyn_o', 'TH_spliceE5_prof_Lib.dyn_hi',
- 'TH_spliceE5_prof.dyn_o', 'TH_spliceE5_prof.dyn_hi',
- 'TH_spliceE5_prof_Lib.o','TH_spliceE5_prof.p.o'])],
- run_command,
- ['$MAKE -s --no-print-directory TH_spliceE5_prof'])
+ [req_profiling, only_ways(['normal']),
+ when(ghc_dynamic(), expect_broken(11495))],
+ run_command, ['$MAKE -s --no-print-directory TH_spliceE5_prof'])
-test('TH_spliceE5_prof_ext',
- [req_profiling,
- only_ways(['normal']),
- extra_clean(['TH_spliceE5_prof_ext_Lib.hi',
- 'TH_spliceE5_prof_ext_Lib.o'])],
- run_command,
- ['$MAKE -s --no-print-directory TH_spliceE5_prof_ext'])
+test('TH_spliceE5_prof_ext', [req_profiling, only_ways(['normal'])],
+ run_command, ['$MAKE -s --no-print-directory TH_spliceE5_prof_ext'])
-test('TH_spliceD1',
- extra_clean(['TH_spliceD1_Lib.hi', 'TH_spliceD1_Lib.o']),
- multimod_compile_fail,
+test('TH_spliceD1', [], multimod_compile_fail,
['TH_spliceD1', '-v0 ' + config.ghc_th_way_flags])
-test('TH_spliceD2',
- extra_clean(['TH_spliceD2_Lib.hi', 'TH_spliceD2_Lib.o']),
- multimod_compile,
- ['TH_spliceD2', '-v0'])
+test('TH_spliceD2', [], multimod_compile, ['TH_spliceD2', '-v0'])
test('TH_reifyDecl1', normal, compile, ['-v0'])
test('TH_reifyDecl2', normal, compile, ['-v0'])
@@ -91,23 +69,15 @@ test('TH_reifyInstances', normal, compile, ['-v0'])
test('TH_spliceDecl1', normal, compile, ['-v0'])
test('TH_spliceDecl2', normal, compile, ['-v0'])
-test('TH_spliceDecl3',
- extra_clean(['TH_spliceDecl3_Lib.hi', 'TH_spliceDecl3_Lib.o']),
- multimod_compile,
+test('TH_spliceDecl3', [], multimod_compile,
['TH_spliceDecl3', '-v0 ' + config.ghc_th_way_flags])
-test('TH_spliceDecl4',
- extra_clean(['TH_spliceDecl4_Lib.hi', 'TH_spliceDecl4_Lib.o']),
- multimod_compile,
+test('TH_spliceDecl4', [], multimod_compile,
['TH_spliceDecl4', '-v0 ' + config.ghc_th_way_flags])
-test('T2597a',
- extra_clean(['T2597a_Lib.hi', 'T2597a_Lib.o']),
- multimod_compile,
+test('T2597a', [], multimod_compile,
['T2597a', '-v0 ' + config.ghc_th_way_flags])
-test('T2597b',
- extra_clean(['T2597b_Lib.hi', 'T2597b_Lib.o']),
- multimod_compile_fail,
+test('T2597b', [], multimod_compile_fail,
['T2597b', '-v0 ' + config.ghc_th_way_flags])
test('TH_spliceE1', normal, compile_and_run, [''])
@@ -117,9 +87,7 @@ test('TH_spliceE4', normal, compile_and_run, [''])
test('TH_class1', normal, compile, ['-v0'])
test('TH_tuple1', normal, compile, ['-v0'])
-test('TH_genEx',
- extra_clean(['TH_genExLib.hi', 'TH_genExLib.o']),
- multimod_compile,
+test('TH_genEx', [], multimod_compile,
['TH_genEx', '-v0 ' + config.ghc_th_way_flags])
test('TH_where', normal, compile_and_run, [''])
@@ -143,9 +111,7 @@ test('TH_ghci1', only_ways(['ghci']), ghci_script, ['TH_ghci1.script'])
test('TH_linePragma', normal, compile_fail, ['-v0'])
-test('T1830_3',
- extra_clean(['T1830_3a.o','T1830_3a.hi']),
- multimod_compile_and_run,
+test('T1830_3', [], multimod_compile_and_run,
['T1830_3', '-v0 ' + config.ghc_th_way_flags])
test('T2700', normal, compile, ['-v0'])
test('T2817', normal, compile, ['-v0'])
@@ -153,13 +119,10 @@ test('T2713', normal, compile_fail, ['-v0'])
test('T2674', normal, compile_fail, ['-v0'])
test('TH_emptycase', normal, compile, ['-v0'])
-test('T2386', [ extra_clean(['T2386_Lib.hi', 'T2386_Lib.o']),
- only_ways(['normal']) ],
- run_command,
- ['$MAKE -s --no-print-directory T2386'] )
+test('T2386', [only_ways(['normal'])], run_command,
+ ['$MAKE -s --no-print-directory T2386'])
-test('T2685', extra_clean(['T2685a.hi','T2685a.o']),
- multimod_compile, ['T2685', '-v0 ' + config.ghc_th_way_flags])
+test('T2685', [], multimod_compile, ['T2685', '-v0 ' + config.ghc_th_way_flags])
test('TH_sections', normal, compile, ['-v0'])
@@ -181,12 +144,11 @@ test('T3467', normal, compile, [''])
test('T3100', normal, compile, ['-v0'])
test('T3920', normal, compile_and_run, ['-v0'])
-test('T3600', extra_clean(['T3600a.hi','T3600a.o']),
- multimod_compile, ['T3600', '-v0 ' + config.ghc_th_way_flags])
+test('T3600', [], multimod_compile, ['T3600', '-v0 ' + config.ghc_th_way_flags])
test('T3845', normal, compile, ['-v0'])
-test('T3899', extra_clean(['T3899a.hi','T3899a.o']),
- multimod_compile,
- ['T3899','-v0 -ddump-splices -dsuppress-uniques ' + config.ghc_th_way_flags])
+test('T3899', [], multimod_compile,
+ ['T3899',
+ '-v0 -ddump-splices -dsuppress-uniques ' + config.ghc_th_way_flags])
test('T4188', normal, compile, ['-v0'])
test('T4233', normal, compile, ['-v0'])
test('T1835', normal, compile_and_run, ['-v0'])
@@ -201,9 +163,7 @@ test('TH_unboxedSingleton', normal, compile, ['-v0'])
test('T5290', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('T5362', normal, compile, ['-v0'])
-test('TH_unresolvedInfix',
- extra_clean(['TH_unresolvedInfix_Lib.hi', 'TH_unresolvedInfix_Lib.o']),
- multimod_compile_and_run,
+test('TH_unresolvedInfix', [], multimod_compile_and_run,
['TH_unresolvedInfix.hs', '-v0 ' + config.ghc_th_way_flags])
test('TH_unresolvedInfix2',
normal,
@@ -214,29 +174,18 @@ test('T5358', normal, compile_fail, [' -v0'])
test('T5379', normal, compile_and_run, [''])
test('T5404', normal, compile, ['-v0'])
test('T5410', normal, compile_and_run, ['-v0'])
-test('TH_lookupName',
- extra_clean(['TH_lookupName_Lib.hi', 'TH_lookupName_Lib.o']),
- multimod_compile_and_run,
+test('TH_lookupName', [], multimod_compile_and_run,
['TH_lookupName.hs', config.ghc_th_way_flags])
test('T5452', normal, compile, ['-v0'])
-test('T5434', extra_clean(['T5434a.hi','T5434a.o']),
- multimod_compile,
- ['T5434','-v0 -Wall ' + config.ghc_th_way_flags])
+test('T5434', [], multimod_compile,
+ ['T5434', '-v0 -Wall ' + config.ghc_th_way_flags])
test('T5508', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
-test('TH_Depends',
- [extra_clean(['TH_Depends_External.o', 'TH_Depends_External.hi',
- 'TH_Depends_external.txt']),
- only_ways(['normal']),
- ],
- run_command,
+test('TH_Depends', [only_ways(['normal'])], run_command,
['$MAKE -s --no-print-directory TH_Depends'])
-test('T5597', extra_clean(['T5597a.hi','T5597a.o']),
- multimod_compile, ['T5597', '-v0 ' + config.ghc_th_way_flags])
-test('T5665', extra_clean(['T5665a.hi','T5665a.o']),
- multimod_compile, ['T5665', '-v0 ' + config.ghc_th_way_flags])
-test('T5700', extra_clean(['T5700a.hi','T5700a.o']),
- multimod_compile,
- ['T5700','-v0 -ddump-splices ' + config.ghc_th_way_flags])
+test('T5597', [], multimod_compile, ['T5597', '-v0 ' + config.ghc_th_way_flags])
+test('T5665', [], multimod_compile, ['T5665', '-v0 ' + config.ghc_th_way_flags])
+test('T5700', [], multimod_compile,
+ ['T5700', '-v0 -ddump-splices ' + config.ghc_th_way_flags])
test('TH_PromotedTuple', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('TH_PromotedList', normal, compile, ['-v0'])
@@ -247,17 +196,14 @@ test('TH_RichKinds2', normal, compile, ['-v0'])
test('T1541', normal, compile, ['-v0'])
test('T5883', normal, compile, ['-v0 -dsuppress-uniques -ddump-splices'])
test('T5882', normal, compile, ['-v0'])
-test('T5886', extra_clean(['T5886a.hi','T5886a.o']),
- multimod_compile, ['T5886','-v0 ' + config.ghc_th_way_flags])
+test('T5886', [], multimod_compile, ['T5886', '-v0 ' + config.ghc_th_way_flags])
test('T4135', normal, compile, ['-v0'])
test('T4135a', normal, compile, ['-v0'])
test('T5971', normal, compile_fail, ['-v0 -dsuppress-uniques'])
test('T5968', normal, compile, ['-v0'])
-test('T5984', extra_clean(['T5984_Lib.hi', 'T5984_Lib.o']),
- multimod_compile,
- ['T5984', '-v0 -ddump-splices ' + config.ghc_th_way_flags])
-test('T5555', extra_clean(['T5555_Lib.hi', 'T5555_Lib.o']),
- multimod_compile, ['T5555', '-v0 ' + config.ghc_th_way_flags])
+test('T5984', [], multimod_compile,
+ ['T5984', '-v0 -ddump-splices ' + config.ghc_th_way_flags])
+test('T5555', [], multimod_compile, ['T5555', '-v0 ' + config.ghc_th_way_flags])
test('T5976', normal, compile_fail, ['-v0'])
test('T5795', normal, compile_fail, ['-v0'])
test('T6005', normal, compile, ['-v0'])
@@ -265,12 +211,9 @@ test('T6005a', normal, compile, ['-v0'])
test('T5737', normal, compile, ['-v0'])
test('T6114', normal, compile, ['-v0'])
test('TH_StringPrimL', normal, compile_and_run, [''])
-test('T7064',
- extra_clean(['T7064a.hi', 'T7064a.o']),
- multimod_compile_and_run,
+test('T7064', [], multimod_compile_and_run,
['T7064.hs', '-v0 ' + config.ghc_th_way_flags])
-test('T7092', extra_clean(['T7092a.hi','T7092a.o']),
- multimod_compile, ['T7092', '-v0 ' + config.ghc_th_way_flags])
+test('T7092', [], multimod_compile, ['T7092', '-v0 ' + config.ghc_th_way_flags])
test('T7276', normal, compile_fail, ['-v0'])
test('T7276a', [ only_ways(['ghci']), combined_output ],
ghci_script, ['T7276a.script'])
@@ -278,15 +221,9 @@ test('T7276a', [ only_ways(['ghci']), combined_output ],
test('TH_TyInstWhere1', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('TH_TyInstWhere2', normal, compile, ['-v0'])
-test('T7445', [ extra_clean(['T7445a.hi', 'T7445a.o']),
- only_ways(['normal']),
- ],
- run_command,
- ['$MAKE -s --no-print-directory T7445'] )
-test('T7532',
- extra_clean(['T7532a.hi', 'T7532a.o']),
- multimod_compile,
- ['T7532', '-v0 ' + config.ghc_th_way_flags])
+test('T7445', [only_ways(['normal'])], run_command,
+ ['$MAKE -s --no-print-directory T7445'])
+test('T7532', [], multimod_compile, ['T7532', '-v0 ' + config.ghc_th_way_flags])
test('T2222', normal, compile, ['-v0'])
test('T1849', only_ways(['ghci']), ghci_script, ['T1849.script'])
test('T7681', normal, compile, ['-v0'])
@@ -295,10 +232,7 @@ test('T7910', normal, compile_and_run, ['-v0'])
test('ClosedFam1TH', normal, compile, ['-dsuppress-uniques -v0'])
test('ClosedFam2TH', normal, compile, ['-v0'])
-test('T8028',
- extra_clean(['T8028a.hi', 'T8028a.o']),
- multimod_compile,
- ['T8028', '-v0 ' + config.ghc_th_way_flags])
+test('T8028', [], multimod_compile, ['T8028', '-v0 ' + config.ghc_th_way_flags])
test('TH_Roles1', normal, compile_fail, ['-v0'])
test('TH_Roles2', normalise_version('array', 'base', 'deepseq', 'ghc-prim',
@@ -325,22 +259,15 @@ test('T7667a', normal, compile_fail, ['-v0'])
test('T8499', normal, compile, ['-v0'])
test('T7477', normal, compile, ['-v0'])
test('T8507', normal, compile, ['-v0'])
-test('T8540',
- extra_clean(['T8540a.hi', 'T8540a.o']),
- multimod_compile,
- ['T8540', '-v0 ' + config.ghc_th_way_flags])
-test('T8577',
- extra_clean(['T8577a.hi', 'T8577a.o']),
- multimod_compile_fail,
+test('T8540', [], multimod_compile, ['T8540', '-v0 ' + config.ghc_th_way_flags])
+test('T8577', [], multimod_compile_fail,
['T8577', '-v0 ' + config.ghc_th_way_flags])
test('T8625', only_ways(['ghci']), ghci_script, ['T8625.script'])
test('TH_StaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, [''])
test('TH_StaticPointers02', [], compile_fail, [''])
test('T8759', normal, compile, ['-v0'])
-test('T7021',
- extra_clean(['T7021a.hi', 'T7021a.o']), multimod_compile,
- ['T7021','-v0 ' + config.ghc_th_way_flags])
+test('T7021', [], multimod_compile, ['T7021', '-v0 ' + config.ghc_th_way_flags])
test('T8807', normal, compile, ['-v0'])
test('T8884', normal, compile, ['-v0'])
test('T8954', normal, compile, ['-v0'])
@@ -368,9 +295,8 @@ test('T8624', only_ways(['normal']),
test('TH_Lift', normal, compile, ['-v0'])
test('T10047', only_ways(['ghci']), ghci_script, ['T10047.script'])
test('T10019', only_ways(['ghci']), ghci_script, ['T10019.script'])
-test('T10267', extra_clean(['T10267a.hi', 'T10267a.o']),
- multimod_compile_fail,
- ['T10267', '-dsuppress-uniques -v0 ' + config.ghc_th_way_flags])
+test('T10267', [], multimod_compile_fail,
+ ['T10267', '-dsuppress-uniques -v0 ' + config.ghc_th_way_flags])
test('T10279', normal, compile_fail, ['-v0'])
test('T10306', normal, compile, ['-v0'])
test('T10596', normal, compile, ['-v0'])
@@ -382,13 +308,9 @@ test('T10697_decided_2', normal, compile_and_run, ['-XStrictData -v0'])
test('T10697_decided_3', omit_ways(['ghci']), # ghci doesn't support -O(2)
compile_and_run,
['-XStrictData -funbox-strict-fields -O2 -v0'])
-test('T10697_source',
- extra_clean(['T10697_sourceUtil.hi', 'T10697_sourceUtil.o']),
- multimod_compile_and_run,
+test('T10697_source', [], multimod_compile_and_run,
['T10697_source', '-w ' + config.ghc_th_way_flags])
-test('T10704',
- extra_clean(['T10704a.o','T10704a.hi']),
- multimod_compile_and_run,
+test('T10704', [], multimod_compile_and_run,
['T10704', '-v0 ' + config.ghc_th_way_flags])
test('T6018th', normal, compile_fail, ['-v0'])
test('TH_namePackage', normal, compile_and_run, ['-v0'])
@@ -404,9 +326,7 @@ test('T10891', normal, compile, ['-v0'])
test('T10945', normal, compile_fail, ['-v0'])
test('T10946', expect_broken(10946), compile, ['-v0'])
test('T10734', normal, compile_and_run, ['-v0'])
-test('T10819',
- extra_clean(['T10819_Lib.hi', 'T10819_Lib.o']),
- multimod_compile,
+test('T10819', [], multimod_compile,
['T10819.hs', '-v0 ' + config.ghc_th_way_flags])
test('T10820', normal, compile_and_run, ['-v0'])
test('T11341', normal, compile, ['-v0 -dsuppress-uniques'])
@@ -428,8 +348,8 @@ test('T11484', normal, compile, ['-v0'])
test('T11629', normal, compile, ['-v0'])
test('T8761', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
-test('T12130', extra_clean(['T12130a.hi','T12130a.o']),
- multimod_compile, ['T12130', '-v0 ' + config.ghc_th_way_flags])
+test('T12130', [], multimod_compile,
+ ['T12130', '-v0 ' + config.ghc_th_way_flags])
test('T12403', omit_ways(['ghci']),
compile_and_run, ['-v0 -ddump-splices -dsuppress-uniques'])
test('T12407', omit_ways(['ghci']), compile, ['-v0'])
@@ -443,8 +363,7 @@ test('T12478_5', omit_ways(['ghci']), compile, ['-v0'])
test('T12513', omit_ways(['ghci']), compile_fail, ['-v0'])
test('T12530', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('T12646', normal, compile, ['-v0'])
-test('T12788', extra_clean(['T12788_Lib.hi', 'T12788_Lib.o']),
- multimod_compile_fail,
- ['T12788.hs', '-v0 ' + config.ghc_th_way_flags])
+test('T12788', [], multimod_compile_fail,
+ ['T12788.hs', '-v0 ' + config.ghc_th_way_flags])
test('T12977', normal, compile, ['-v0'])
test('T12993', normal, multimod_compile, ['T12993.hs', '-v0'])
diff --git a/testsuite/tests/typecheck/bug1465/all.T b/testsuite/tests/typecheck/bug1465/all.T
index 3847d684d8..695deac4fe 100644
--- a/testsuite/tests/typecheck/bug1465/all.T
+++ b/testsuite/tests/typecheck/bug1465/all.T
@@ -1,4 +1 @@
-test('bug1465',
- clean_cmd('$MAKE -s clean'),
- run_command,
- ['$MAKE -s --no-print-directory bug1465'])
+test('bug1465', [], run_command, ['$MAKE -s --no-print-directory bug1465'])
diff --git a/testsuite/tests/typecheck/prog001/test.T b/testsuite/tests/typecheck/prog001/test.T
index 1f0d67cbae..e3bb5eb622 100644
--- a/testsuite/tests/typecheck/prog001/test.T
+++ b/testsuite/tests/typecheck/prog001/test.T
@@ -1,6 +1,2 @@
-test('typecheck.prog001',
- [when(fast(), skip),
- extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o', 'C.hi', 'C.o'])],
- multimod_compile,
- ['C', '-v0'])
+test('typecheck.prog001', [when(fast(), skip)], multimod_compile, ['C', '-v0'])
diff --git a/testsuite/tests/typecheck/prog002/test.T b/testsuite/tests/typecheck/prog002/test.T
index 93666c2819..4e26a14251 100644
--- a/testsuite/tests/typecheck/prog002/test.T
+++ b/testsuite/tests/typecheck/prog002/test.T
@@ -1,5 +1 @@
-test('typecheck.prog002',
- [when(fast(), skip),
- extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o'])],
- multimod_compile,
- ['B', '-v0'])
+test('typecheck.prog002', [when(fast(), skip)], multimod_compile, ['B', '-v0'])
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index d322cc0e00..ccebf75765 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -171,19 +171,13 @@ test('tc167', normal, compile_fail, [''])
test('tc168', normal, compile_fail, [''])
test('tc169', normal, compile, [''])
-test('tc170',
- extra_clean(['Tc170_Aux.hi', 'Tc170_Aux.o']),
- run_command,
- ['$MAKE -s --no-print-directory tc170'])
+test('tc170', [], run_command, ['$MAKE -s --no-print-directory tc170'])
test('tc171', normal, compile, [''])
test('tc172', normal, compile, [''])
# The point about this test is that it compiles Tc173a and Tc173b *separately*
-test('tc173',
- extra_clean(['Tc173a.hi', 'Tc173a.o', 'Tc173b.hi', 'Tc173b.o']),
- run_command,
- ['$MAKE -s --no-print-directory tc173'])
+test('tc173', [], run_command, ['$MAKE -s --no-print-directory tc173'])
test('tc174', normal, compile, [''])
test('tc175', normal, compile, [''])
@@ -254,18 +248,14 @@ test('tc236', normal, compile, [''])
test('tc237', normal, compile, [''])
test('tc238', normal, compile, [''])
-test('tc239', extra_clean(['Tc239_Help.hi', 'Tc239_Help.o']),
- multimod_compile, ['tc239', '-v0'])
+test('tc239', [], multimod_compile, ['tc239', '-v0'])
test('tc240', normal, compile, [''])
test('tc241', normal, compile, [''])
test('tc242', normal, compile, [''])
test('tc243', normal, compile, [''])
test('tc244', normal, compile, [''])
-test('tc245',
- extra_clean(['Tc245_A.hi', 'Tc245_A.o', 'tc245.hi', 'tc245.o']),
- run_command,
- ['$MAKE -s --no-print-directory tc245'])
+test('tc245', [], run_command, ['$MAKE -s --no-print-directory tc245'])
test('tc246', normal, compile, [''])
test('tc247', normal, compile, [''])
test('tc248', normal, compile, [''])
@@ -279,8 +269,7 @@ test('faxen', normal, compile, [''])
test('T1495', normal, compile, [''])
test('T2045', normal, compile, ['']) # Needs -fhpc
test('T2478', normal, compile, [''])
-test('T2433', extra_clean(['T2433_Help.hi', 'T2433_Help.o']),
- multimod_compile, ['T2433', '-v0'])
+test('T2433', [], multimod_compile, ['T2433', '-v0'])
test('T2494', normal, compile_fail, [''])
test('T2494-2', normal, compile, [''])
test('T2497', normal, compile, [''])
@@ -306,12 +295,7 @@ test('T3955', normal, compile, [''])
test('PolyRec', normal, compile, [''])
test('twins', normal, compile, [''])
-test('T2412',
- extra_clean(['T2412.hi-boot', 'T2412.o-boot',
- 'T2412A.hi', 'T2412A.o',
- 'T2412.hi', 'T2412.o']),
- run_command,
- ['$MAKE --no-print-directory -s T2412'])
+test('T2412', [], run_command, ['$MAKE --no-print-directory -s T2412'])
test('T2846', normal, compile, [''])
test('T4284', normal, compile, [''])
@@ -332,8 +316,7 @@ test('T4498', normal, compile, [''])
test('T4524', normal, compile, [''])
test('T4917', normal, compile, [''])
-test('T4912', extra_clean(['T4912a.hi', 'T4912a.o']),
- multimod_compile, ['T4912', '-v0'])
+test('T4912', [], multimod_compile, ['T4912', '-v0'])
test('T4952', normal, compile, [''])
test('T4969', normal, compile, [''])
@@ -341,8 +324,7 @@ test('T5120', normal, compile, [''])
test('mc18', normal, compile, [''])
test('tc249', normal, compile, [''])
test('tc250', normal, compile, [''])
-test('tc251', extra_clean(['Tc251_Help.hi', 'Tc251_Help.o']),
- multi_compile, ['tc251', [('Tc251_Help.hs', '')], '-v0'])
+test('tc251', [], multi_compile, ['tc251', [('Tc251_Help.hs', '')], '-v0'])
test('tc252', normal, compile, [''])
test('tc253', normal, compile, [''])
test('tc254', normal, compile, [''])
@@ -354,18 +336,10 @@ test('tc259', normal, compile, [''])
test('tc260', normal, compile, [''])
test('tc261', normal, compile, [''])
test('tc262', normal, compile, [''])
-test('tc263',
- extra_clean(['Tc263_Help.o','Tc263_Help.hi']),
- multimod_compile, ['tc263','-v0'])
+test('tc263', [], multimod_compile, ['tc263', '-v0'])
test('tc265', compile_timeout_multiplier(0.01), compile, [''])
-test('tc266',
- [extra_clean(['Tc266.hi-boot', 'Tc266.o-boot', 'Tc266a.hi', 'Tc266a.o', 'Tc266.hi', 'Tc266.o'])] ,
- run_command,
- ['$MAKE -s --no-print-directory tc266'])
-test('Tc267',
- extra_clean(['Tc267a.hi-boot', 'Tc267a.o-boot', 'Tc267b.hi-boot', 'Tc267b.o-boot', 'Tc267a.hi', 'Tc267a.o', 'Tc267b.hi', 'Tc267b.o']),
- run_command,
- ['$MAKE -s --no-print-directory Tc267'])
+test('tc266', [], run_command, ['$MAKE -s --no-print-directory tc266'])
+test('Tc267', [], run_command, ['$MAKE -s --no-print-directory Tc267'])
test('tc268', normal, compile, [''])
test('tc269', normal, compile, [''])
test('tc270', normal, compile, [''])
@@ -397,9 +371,7 @@ test('DfltProb1', normal, compile, ['-O'])
# Add -O for DfltProb1 to expose Trac #11291
test('DfltProb2', normal, compile, [''])
test('T6134', normal, compile, [''])
-test('T6018', extra_clean(['T6018.hi' , 'T6018.o'
- ,'T6018A.hi', 'T6018A.o'])
- , multimod_compile, ['T6018', ''])
+test('T6018', [], multimod_compile, ['T6018', ''])
test('TcLambdaCase', [], compile, [''])
test('T7147', normal, compile, [''])
test('T7171',normal,run_command,
@@ -498,19 +470,14 @@ test('T10770a', expect_broken(10770), compile, [''])
test('T10770b', expect_broken(10770), compile, [''])
test('T10935', normal, compile, [''])
test('T10971a', normal, compile, [''])
-test('T11062', extra_clean(['T11062.hi-boot', 'T11062.o-boot', 'T11062a.hi', 'T11062a.o']),
- multimod_compile, ['T11062', '-v0'])
+test('T11062', [], multimod_compile, ['T11062', '-v0'])
test('T11237', normal, compile, [''])
test('T10592', normal, compile, [''])
test('T11305', normal, compile, [''])
test('T11254', normal, compile, [''])
test('T11379', normal, compile, [''])
-test('T11462',
- [extra_clean(['T11462_Plugin.hi', 'T11462_Plugin.o']),
- unless(have_dynamic(), expect_broken(10301))],
- multi_compile,
- ['', [('T11462_Plugin.hs', '-package ghc'),
- ('T11462.hs', '')],
+test('T11462', [unless(have_dynamic(), expect_broken(10301))], multi_compile,
+ ['', [('T11462_Plugin.hs', '-package ghc'), ('T11462.hs', '')],
'-dynamic'])
test('T11480', normal, compile, [''])
test('RebindHR', normal, compile, [''])
@@ -530,8 +497,7 @@ test('T11811', normal, compile, [''])
test('T11793', normal, compile, [''])
test('T11348', normal, compile, [''])
test('T11947', normal, compile, [''])
-test('T12064', extra_clean(['T12064.hi-boot', 'T12064.o-boot', 'T11062a.hi', 'T11062a.o']),
- multimod_compile, ['T12064', '-v0'])
+test('T12064', [], multimod_compile, ['T12064', '-v0'])
test('ExPat', normal, compile, [''])
test('ExPatFail', normal, compile_fail, [''])
test('SigTyVars', normal, compile, [''])
@@ -542,8 +508,7 @@ test('T11339b', normal, compile, [''])
test('T11339c', normal, compile, [''])
test('T11339d', normal, compile, [''])
test('T11974', normal, compile, [''])
-test('T12067', extra_clean(['T12067a.hi', 'T12067a.o']),
- multimod_compile, ['T12067', '-v0'])
+test('T12067', [], multimod_compile, ['T12067', '-v0'])
test('T12185', normal, compile, [''])
test('T12133', normal, compile, [''])
test('T12381', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index f4db8bac4e..493ac77cee 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -168,9 +168,7 @@ test('tcfail182', normal, compile_fail, [''])
test('tcfail183', normal, compile_fail, [''])
test('tcfail184', normal, compile_fail, [''])
test('tcfail185', normal, compile_fail, [''])
-test('tcfail186',
- extra_clean(['Tcfail186_Help.hi', 'Tcfail186_Help.o']),
- multimod_compile_fail, ['tcfail186', '-v0'])
+test('tcfail186', [], multimod_compile_fail, ['tcfail186', '-v0'])
test('tcfail187', normal, compile_fail, [''])
test('tcfail188', normal, compile, [''])
@@ -215,8 +213,7 @@ test('T3950', normal, compile_fail, [''])
test('T3966', normal, compile_fail, ['-O'])
test('IPFail', normal, compile_fail, [''])
-test('T3468', extra_clean(['T3468.hi-boot', 'T3468.o-boot', 'T3468a.hi', 'T3468a.o']),
- multimod_compile_fail, ['T3468', '-v0'])
+test('T3468', [], multimod_compile_fail, ['T3468', '-v0'])
test('T2846b', normal, compile_fail, [''])
test('FrozenErrorTests', normal, compile_fail, [''])
test('SCLoop', normal, compile_fail, [''])
@@ -274,12 +271,7 @@ test('T5957', normal, compile_fail, [''])
test('T6001', normal, compile_fail, [''])
test('T6022', normal, compile_fail, [''])
test('T5853', normal, compile_fail, [''])
-test('T6018fail', extra_clean([ 'T6018fail.hi' , 'T6018fail.o'
- , 'T6018Afail.hi', 'T6018Afail.o'
- , 'T6018Bfail.hi', 'T6018Bfail.o'
- , 'T6018Cfail.hi', 'T6018Cfail.o'
- , 'T6018Dfail.hi', 'T6018Dfail.o'])
- , multimod_compile_fail, ['T6018fail', '-no-hs-main -c'])
+test('T6018fail', [], multimod_compile_fail, ['T6018fail', '-no-hs-main -c'])
test('T6018failclosed', normal, compile_fail, [''])
test('T6018failclosed2', normal, compile_fail, [''])
test('T6078', normal, compile_fail, [''])
@@ -337,8 +329,7 @@ test('T8450', normal, compile_fail, [''])
test('T8514', normal, compile_fail, [''])
test('ContextStack1', normal, compile_fail, ['-freduction-depth=10'])
test('ContextStack2', normal, compile, [''])
-test('T8570', extra_clean(['T85570a.o', 'T8570a.hi','T85570b.o', 'T8570b.hi']),
- multimod_compile_fail, ['T8570', '-v0'])
+test('T8570', [], multimod_compile_fail, ['T8570', '-v0'])
test('T8603', normal, compile_fail, [''])
test('TcStaticPointersFail01', [], compile_fail, [''])
test('TcStaticPointersFail02', [], compile_fail, [''])
@@ -370,12 +361,9 @@ test('T9858a', normal, compile_fail, [''])
test('T9858b', normal, compile_fail, [''])
test('T9858e', normal, compile_fail, [''])
-test('T10285',
- extra_clean(['T10285a.hi', 'T10285a.o']),
- multimod_compile_fail, ['T10285', '-v0'])
+test('T10285', [], multimod_compile_fail, ['T10285', '-v0'])
test('T10351', normal, compile_fail, [''])
-test('T10534', extra_clean(['T10534a.hi', 'T10534a.o']),
- multimod_compile_fail, ['T10534', '-v0'])
+test('T10534', [], multimod_compile_fail, ['T10534', '-v0'])
test('T10495', normal, compile_fail, [''])
test('VtaFail', normal, compile_fail, [''])
@@ -388,7 +376,7 @@ test('T10836', normal, compile_fail, [''])
test('T10715', normal, compile, [''])
test('T10715b', normal, compile_fail, [''])
test('T10971b', normal, compile_fail, [''])
-test('T10971d', extra_clean(['T10971c.hi', 'T10971c.o']), multimod_compile_fail, ['T10971d','-v0'])
+test('T10971d', [], multimod_compile_fail, ['T10971d', '-v0'])
test('CustomTypeErrors01', normal, compile_fail, [''])
test('CustomTypeErrors02', normal, compile_fail, [''])
test('CustomTypeErrors03', normal, compile_fail, [''])
@@ -412,12 +400,9 @@ test('T11947a', normal, compile_fail, [''])
test('T11948', normal, compile_fail, [''])
test('T11990a', normal, compile_fail, [''])
test('T11990b', normal, compile_fail, [''])
-test('T12035', extra_clean(['T12035.hi-boot', 'T12035.o-boot', 'T12035a.hi', 'T12035a.o']),
- multimod_compile_fail, ['T12035', '-v0'])
-test('T12035j', [ req_smp, extra_clean(['T12035.hi-boot', 'T12035.o-boot', 'T12035a.hi', 'T12035a.o']) ],
- multimod_compile_fail, ['T12035', '-j2 -v0'])
-test('T12063', [ expect_broken(12063), extra_clean(['T12063.hi-boot', 'T12063.o-boot', 'T12063a.hi', 'T12063a.o']) ],
- multimod_compile_fail, ['T12063', '-v0'])
+test('T12035', [], multimod_compile_fail, ['T12035', '-v0'])
+test('T12035j', [req_smp], multimod_compile_fail, ['T12035', '-j2 -v0'])
+test('T12063', [expect_broken(12063)], multimod_compile_fail, ['T12063', '-v0'])
test('T11974b', normal, compile_fail, [''])
test('T12151', normal, compile_fail, [''])
test('T7437', normal, compile_fail, [''])
@@ -430,7 +415,7 @@ test('T12529', normal, compile_fail, [''])
test('T12729', normal, compile_fail, [''])
test('T12785b', normal, compile_fail, [''])
test('T12803', normal, compile_fail, [''])
-test('T12042', extra_clean(['T12042a.hi', 'T12042a.o', 'T12042.hi-boot', 'T12042.o-boot']), multimod_compile_fail, ['T12042', ''])
+test('T12042', [], multimod_compile_fail, ['T12042', ''])
test('T12966', normal, compile_fail, [''])
test('T12837', normal, compile_fail, [''])
test('T12921', normal, compile_fail, [''])
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index ff138e4e4d..eab9f8a8a8 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -39,8 +39,7 @@ test('tcrun022', omit_ways(['ghci']), compile_and_run, ['-O'])
test('tcrun023', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, ['-O'])
test('tcrun024', normal, compile_and_run, ['-O'])
-test('tcrun025', extra_clean(['TcRun025_B.hi', 'TcRun025_B.o']),
- multimod_compile_and_run, ['tcrun025',''])
+test('tcrun025', [], multimod_compile_and_run, ['tcrun025', ''])
test('tcrun026', normal, compile_and_run, [''])
test('tcrun027', normal, compile_and_run, [''])
test('tcrun028', normal, compile_and_run, [''])
@@ -54,10 +53,7 @@ test('tcrun035', normal, compile_and_run, [''])
test('tcrun036', normal, compile_and_run, [''])
test('tcrun037', normal, compile_and_run, [''])
-test('tcrun038',
- extra_clean(['TcRun038_B.hi', 'TcRun038_B.o']),
- multimod_compile_and_run,
- ['tcrun038',''])
+test('tcrun038', [], multimod_compile_and_run, ['tcrun038', ''])
test('tcrun039', normal, compile_and_run, [''])
test('tcrun040', normal, compile_and_run, [''])
diff --git a/testsuite/tests/typecheck/testeq1/test.T b/testsuite/tests/typecheck/testeq1/test.T
index c1b97e90fe..6d9f66d6c0 100644
--- a/testsuite/tests/typecheck/testeq1/test.T
+++ b/testsuite/tests/typecheck/testeq1/test.T
@@ -1,9 +1,3 @@
-test('typecheck.testeq1',
- [when(fast(), skip),
- extra_clean(['Main.hi', 'Main.o',
- 'TypeCast.hi', 'TypeCast.o',
- 'FakePrelude.hi', 'FakePrelude.o',
- 'TypeEq.hi', 'TypeEq.o'])],
- multimod_compile_and_run,
+test('typecheck.testeq1', [when(fast(), skip)], multimod_compile_and_run,
['Main', '-v0'])
diff --git a/testsuite/tests/unboxedsums/module/all.T b/testsuite/tests/unboxedsums/module/all.T
index fe76aac11d..a3bd68e652 100644
--- a/testsuite/tests/unboxedsums/module/all.T
+++ b/testsuite/tests/unboxedsums/module/all.T
@@ -1,4 +1,2 @@
-test('sum_mod',
- [normalise_slashes, clean_cmd('$MAKE -s clean'), extra_files(['Lib.hs', 'Main.hs'])],
- run_command,
- ['$MAKE -s main --no-print-director'])
+test('sum_mod', [normalise_slashes, extra_files(['Lib.hs', 'Main.hs'])],
+ run_command, ['$MAKE -s main --no-print-director'])
diff --git a/testsuite/tests/warnings/should_compile/T10637/all.T b/testsuite/tests/warnings/should_compile/T10637/all.T
index 2be9756fae..903efdbd0e 100644
--- a/testsuite/tests/warnings/should_compile/T10637/all.T
+++ b/testsuite/tests/warnings/should_compile/T10637/all.T
@@ -1,2 +1 @@
-test('T10637', extra_clean(['T10637.o','T10637.hi', 'A.hi', 'A.o', 'A.hi-boot', 'A.o-boot']),
- multimod_compile, ['T10637', '-v0 -fwarn-unused-imports'])
+test('T10637', [], multimod_compile, ['T10637', '-v0 -fwarn-unused-imports'])
diff --git a/testsuite/tests/warnings/should_compile/T10890/all.T b/testsuite/tests/warnings/should_compile/T10890/all.T
index d5c6894517..29055256a1 100644
--- a/testsuite/tests/warnings/should_compile/T10890/all.T
+++ b/testsuite/tests/warnings/should_compile/T10890/all.T
@@ -1,11 +1,7 @@
-test('T10890',
- extra_clean(['A.o', 'A.hi', 'B.o', 'B.hi']),
- multimod_compile, ['T10890', '-v0 -fwarn-unused-imports'])
+test('T10890', [], multimod_compile, ['T10890', '-v0 -fwarn-unused-imports'])
-test('T10890_1',
- extra_clean(['Base.o', 'Base.hi', 'Extends.o', 'Extends.hi']),
- multimod_compile, ['T10890_1', '-v0 -fwarn-unused-imports'])
+test('T10890_1', [], multimod_compile,
+ ['T10890_1', '-v0 -fwarn-unused-imports'])
-test('T10890_2',
- extra_clean(['T10890_2A.o', 'T10890_2A.hi', 'T10890_2B.o', 'T10890_2B.hi']),
- multimod_compile, ['T10890_2', '-v0 -fwarn-unused-imports'])
+test('T10890_2', [], multimod_compile,
+ ['T10890_2', '-v0 -fwarn-unused-imports'])
diff --git a/testsuite/tests/warnings/should_compile/all.T b/testsuite/tests/warnings/should_compile/all.T
index f7f0194011..aa03b4228c 100644
--- a/testsuite/tests/warnings/should_compile/all.T
+++ b/testsuite/tests/warnings/should_compile/all.T
@@ -1,8 +1,6 @@
# -fwarn-missing-exported-signatures should take precedence over -fwarn-missing-signatures
test('T2526', normal, compile, ['-fwarn-missing-signatures -fwarn-missing-exported-signatures'])
-test('T9178', extra_clean(['T9178.o', 'T9178DataType.o',
- 'T9178.hi', 'T9178DataType.hi']),
- multimod_compile, ['T9178', '-Wall'])
+test('T9178', [], multimod_compile, ['T9178', '-Wall'])
# T9230.hs contains a tab charater. Test that -Wtabs is enabled by default.
test('T9230', normal, compile, [''])
@@ -16,11 +14,7 @@ test('PluralS', normal, compile, [''])
# T12574 Test that suggest current flag over deprecated
test('T12574',normal, compile, ['-fwarn-missing-local-signatures'])
-test('DeprU',
- extra_clean([
- 'DeprM.o', 'DeprU.o',
- 'DeprM.hi', 'DeprU.hi']),
- multimod_compile, ['DeprU', '-Wall'])
+test('DeprU', [], multimod_compile, ['DeprU', '-Wall'])
test('Werror01', normal, compile, [''])
test('Werror02', normal, compile, [''])