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

33 files changed, 111 insertions, 477 deletions

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'])