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

4 files changed, 14 insertions, 58 deletions

diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index b5d4b1c4eb..f23cc8804a 100644
--- a/testsuite/tests/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
@@ -12,15 +12,5 @@
 # multiple cores, which is why it is only running the 'threaded2' way
 # right now. --SDM 1/4/2010
 
-test('concprog001',
-     [when(fast(), skip),
-      only_ways(['threaded2']),
-      extra_clean(['Arithmetic.hi', 'Arithmetic.o',
-                   'Converter.hi',  'Converter.o',
-                   'Mult.hi',       'Mult.o',
-                   'Stream.hi',     'Stream.o',
-                   'Thread.hi',     'Thread.o',
-                   'Trit.hi',       'Trit.o',
-                   'Utilities.hi',  'Utilities.o'])],
-     multimod_compile_and_run,
-     ['Mult',''])
+test('concprog001', [when(fast(), skip), only_ways(['threaded2'])],
+     multimod_compile_and_run, ['Mult', ''])
diff --git a/testsuite/tests/concurrent/prog002/all.T b/testsuite/tests/concurrent/prog002/all.T
index 54613a7e4a..dc583b3bd2 100644
--- a/testsuite/tests/concurrent/prog002/all.T
+++ b/testsuite/tests/concurrent/prog002/all.T
@@ -10,14 +10,6 @@ else:
 # hence -O0:
 
 test('concprog002',
-     [only_ways(['threaded2','threaded2_hT']),
-      extra_ways(ways),
-      exit_code(1),
-      when(fast(), skip),
-      reqlib('random'),
-      extra_clean(['Event.hi',     'Event.o',
-                   'Scheduler.hi', 'Scheduler.o',
-                   'Server.hi',    'Server.o',
-                   'Thread.hi',    'Thread.o'])],
-     multimod_compile_and_run,
-     ['Server','-O0'])
+     [only_ways(['threaded2', 'threaded2_hT']), extra_ways(ways), exit_code(1),
+      when(fast(), skip), reqlib('random')],
+     multimod_compile_and_run, ['Server', '-O0'])
diff --git a/testsuite/tests/concurrent/prog003/all.T b/testsuite/tests/concurrent/prog003/all.T
index 7522b10010..2f7fe3bec8 100644
--- a/testsuite/tests/concurrent/prog003/all.T
+++ b/testsuite/tests/concurrent/prog003/all.T
@@ -10,25 +10,6 @@
 # occasionally, but at least the test is here for posterity.
 
 test('concprog003',
-     [when(fast(), skip),
-      extra_clean([
-           'BackList2.hi', 'BackList2.o',
-           'ImmList.hi', 'ImmList.o',
-           'MainMVarList.hi', 'MainMVarList.o',
-           'TestDataParser.hi', 'TestDataParser.o',
-           'CASList.hi', 'CASList.o',
-           'IOList.hi', 'IOList.o',
-           'MVarListLockCoupling.hi', 'MVarListLockCoupling.o',
-           'TestRun.hi', 'TestRun.o',
-           'Collate.hi', 'Collate.o',
-           'LazyList2.hi', 'LazyList2.o',
-           'RefInterface.hi', 'RefInterface.o',
-           'Collection.hi', 'Collection.o',
-           'Main.hi', 'Main.o',
-           'TestData.hi', 'TestData.o'
-         ]),
-      reqlib('random'),
-      extra_run_opts('IMM -t test-8-3000-3000-2-1-4'),
-     ],
-     multimod_compile_and_run,
-     ['Main',''])
+     [when(fast(), skip), reqlib('random'),
+      extra_run_opts('IMM -t test-8-3000-3000-2-1-4')],
+     multimod_compile_and_run, ['Main', ''])
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 24ea29d2b7..87af525e9f 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -227,12 +227,9 @@ test('conc045', normal, compile_and_run, [''])
 test('conc058', normal, compile_and_run, [''])
 
 test('conc059',
-     [
-      only_ways(['threaded1','threaded2']),
-      pre_cmd('$MAKE -s --no-print-directory conc059_setup'),
-      extra_clean(['conc059_c.o'])],
-     compile_and_run,
-     ['conc059_c.c -no-hs-main'])
+     [only_ways(['threaded1', 'threaded2']),
+      pre_cmd('$MAKE -s --no-print-directory conc059_setup')],
+     compile_and_run, ['conc059_c.c -no-hs-main'])
 
 # This test sometimes just exits successfully
 # when run the threaded2 way. The problem hasn't been diagnosed yet
@@ -268,13 +265,9 @@ test('hs_try_putmvar001',
 # A benchmark for hs_try_putmvar() vs. foreign export
 # This one should work for both threaded and non-threaded RTS
 test('hs_try_putmvar002',
-     [
-     pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar002_setup'),
-     extra_clean(['hs_try_putmvar002_c.o']),
-     extra_run_opts('1 8 10000')
-     ],
-     compile_and_run,
-     ['hs_try_putmvar002_c.c'])
+     [pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar002_setup'),
+      extra_run_opts('1 8 10000')],
+     compile_and_run, ['hs_try_putmvar002_c.c'])
 
 # Another benchmark for hs_try_putmvar() vs. foreign export
 test('hs_try_putmvar003',