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

9 files changed, 48 insertions, 195 deletions

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