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

13 files changed, 52 insertions, 135 deletions

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