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

3 files changed, 55 insertions, 135 deletions

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