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

2 files changed, 23 insertions, 56 deletions

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