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, 31 insertions, 62 deletions

diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 44619dce88..5dab48f95d 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -9,17 +9,12 @@ test('IOError001', [omit_ways(['ghci']), set_stdin('IOError001.hs')],
 
 test('IOError002',      normal, compile_and_run, [''])
 test('finalization001', normal, compile_and_run, [''])
-test('hClose001',       extra_clean(['hClose001.tmp']), compile_and_run, [''])
-test('hClose002',       extra_clean(['hClose002.tmp']), compile_and_run, [''])
+test('hClose001', [], compile_and_run, [''])
+test('hClose002', [], compile_and_run, [''])
 test('hClose003',       reqlib('unix'), compile_and_run, ['-package unix'])
 test('hFileSize001',    normal, compile_and_run, [''])
-test('hFileSize002',
-     [omit_ways(['ghci']),
-      extra_clean(['hFileSize002.out'])],
-     compile_and_run, [''])
-test('hFlush001',
-     extra_clean(['hFlush001.out']),
-     compile_and_run, [''])
+test('hFileSize002', [omit_ways(['ghci'])], compile_and_run, [''])
+test('hFlush001', [], compile_and_run, [''])
 
 test('hGetBuffering001', 
 	[omit_ways(['ghci']), set_stdin('hGetBuffering001.hs')], 
@@ -29,11 +24,9 @@ test('hGetChar001', normal, compile_and_run, [''])
 test('hGetLine001', set_stdin('hGetLine001.hs'), compile_and_run, ['-cpp'])
 test('hGetLine002', normal, compile_and_run, [''])
 test('hGetLine003', normal, compile_and_run, [''])
-test('hGetPosn001',
-     extra_clean(['hGetPosn001.out']),
-     compile_and_run, ['-cpp'])
+test('hGetPosn001', [], compile_and_run, ['-cpp'])
 test('hIsEOF001',   normal, compile_and_run, [''])
-test('hIsEOF002', extra_clean(['hIsEOF002.out']), compile_and_run, ['-cpp'])
+test('hIsEOF002', [], compile_and_run, ['-cpp'])
 
 test('hReady001', normal, compile_and_run, ['-cpp'])
 
@@ -47,7 +40,7 @@ test('hReady002', [cmd_prefix('sleep 1 |'), omit_ways(['ghci'])],
 test('hSeek001', normal, compile_and_run, [''])
 test('hSeek002', normal, compile_and_run, ['-cpp'])
 test('hSeek003', normal, compile_and_run, ['-cpp'])
-test('hSeek004', extra_clean(['hSeek004.out']), compile_and_run, ['-cpp'])
+test('hSeek004', [], compile_and_run, ['-cpp'])
 
 test('hSetBuffering002', set_stdin('hSetBuffering002.hs'), compile_and_run, [''])
 
@@ -62,37 +55,27 @@ test('ioeGetFileName001',    normal, compile_and_run, ['-cpp'])
 test('ioeGetHandle001',      normal, compile_and_run, ['-cpp'])
 test('isEOF001', extra_run_opts('</dev/null'), compile_and_run, [''])
 
-test('misc001',
-     [extra_run_opts('misc001.hs misc001.out'),
-      extra_clean(['misc001.out'])],
-	compile_and_run, [''])
+test('misc001', [extra_run_opts('misc001.hs misc001.out')], compile_and_run,
+     [''])
 
 test('openFile001',  normal, compile_and_run, [''])
 test('openFile002',  exit_code(1), compile_and_run, [''])
-test('openFile003',  extra_clean(['openFile003Dir']), compile_and_run, [''])
-test('openFile004',  extra_clean(['openFile004.out']), compile_and_run, [''])
-test('openFile005',  extra_clean(['openFile005.out1', 'openFile005.out2']),
-     compile_and_run, [''])
-test('openFile006', extra_clean(['openFile006.out']), compile_and_run, [''])
-test('openFile007', extra_clean(['openFile007.out']), compile_and_run, [''])
+test('openFile003', [], compile_and_run, [''])
+test('openFile004', [], compile_and_run, [''])
+test('openFile005', [], compile_and_run, [''])
+test('openFile006', [], compile_and_run, [''])
+test('openFile007', [], compile_and_run, [''])
 test('openFile008', cmd_prefix('ulimit -n 2048; '), compile_and_run, [''])
 
 test('putStr001',    normal, compile_and_run, [''])
-test('readFile001',  extra_clean(['readFile001.out']),
-     compile_and_run, [''])
-test('readwrite001',
-     extra_clean(['readwrite001.inout']),
-     compile_and_run,
-     ['-cpp'])
+test('readFile001', [], compile_and_run, [''])
+test('readwrite001', [], compile_and_run, ['-cpp'])
 
 
-test('readwrite002',
-     [omit_ways(['ghci']), 
-      set_stdin('readwrite002.hs'),
-      extra_clean(['readwrite002.inout'])],
+test('readwrite002', [omit_ways(['ghci']), set_stdin('readwrite002.hs')],
      compile_and_run, ['-cpp'])
 
-test('readwrite003', extra_clean(['readwrite003.txt']), compile_and_run, [''])
+test('readwrite003', [], compile_and_run, [''])
 
 test('hGetBuf001',
      [
@@ -100,22 +83,17 @@ test('hGetBuf001',
       expect_fail_if_windows],
      compile_and_run, ['-package unix'])
 
-test('hDuplicateTo001', extra_clean(['tmp']), compile_and_run, [''])
+test('hDuplicateTo001', [], compile_and_run, [''])
 
-test('countReaders001',
-      extra_clean(['countReaders001.txt']),
-      compile_and_run, [''])
+test('countReaders001', [], compile_and_run, [''])
 
 test('concio001', normal, run_command, ['$MAKE -s --no-print-directory test.concio001'])
 test('concio001.thr', normal, run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
 
 test('concio002', reqlib('process'), compile_and_run, [''])
 
-test('T2122', extra_clean(['T2122-test']), compile_and_run, [''])
-test('T3307',
-     [extra_clean(['chinese-file-小说', 'chinese-name'])],
-     run_command,
-     ['$MAKE -s --no-print-directory T3307-test'])
+test('T2122', [], compile_and_run, [''])
+test('T3307', [], run_command, ['$MAKE -s --no-print-directory T3307-test'])
 test('T4855', normal, compile_and_run, [''])
 
 test('hSetEncoding001',extra_run_opts('hSetEncoding001.in'), compile_and_run, [''])
@@ -130,21 +108,17 @@ for e in encoding001Encodings:
 for e1 in encoding001Encodings:
     for e2 in encoding001Encodings:
         encoding001CleanFiles.append('encoding001.' + e1 + '.' + e2)
-test('encoding001',
-     extra_clean(encoding001CleanFiles),
-     compile_and_run, [''])
+test('encoding001', [], compile_and_run, [''])
 
 test('encoding002', normal, compile_and_run, [''])
 test('encoding003', normal, compile_and_run, [''])
 test('encoding004', normal, compile_and_run, [''])
 test('encoding005', normal, compile_and_run, [''])
 
-test('environment001',
-     [extra_clean(['environment001'])],
-     run_command,
+test('environment001', [], run_command,
      ['$MAKE -s --no-print-directory environment001-test'])
 
-test('newline001', extra_clean(['newline001.out']), compile_and_run, [''])
+test('newline001', [], compile_and_run, [''])
 
 test('openTempFile001', normal, compile_and_run, [''])
 
@@ -152,6 +126,6 @@ test('T4144', normal, compile_and_run, [''])
 
 test('encodingerror001', normal, compile_and_run, [''])
 
-test('T4808', [exit_code(1), extra_clean(['T4808.test'])], compile_and_run, [''])
+test('T4808', [exit_code(1)], compile_and_run, [''])
 test('T4895', normal, compile_and_run, [''])
 test('T7853', normal, compile_and_run, [''])
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 6899e40ff0..3211054f0a 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -47,7 +47,7 @@ test('trace001', normal, compile_and_run, [''])
 test('hGetBuf002', normal, compile_and_run, [''])
 test('hGetBuf003', normal, compile_and_run, [''])
 test('hPutBuf001', normal, compile_and_run, [''])
-test('hPutBuf002', extra_clean(['hPutBuf002.out']), compile_and_run, [''])
+test('hPutBuf002', [], compile_and_run, [''])
 
 test('char001', 	normal, compile_and_run, [''])
 test('char002', 	normal, compile_and_run, [''])
@@ -92,16 +92,11 @@ test('list002', when(fast(), skip), compile_and_run, [''])
 test('list003', when(fast(), skip), compile_and_run, [''])
 test('isSuffixOf', normal, compile_and_run, [''])
 
-test('memo001',
-     [extra_run_opts('+RTS -A10k -RTS'),
-      extra_clean(['Memo1.hi', 'Memo1.o'])],
-     multimod_compile_and_run,
-     ['memo001',''])
+test('memo001', [extra_run_opts('+RTS -A10k -RTS')], multimod_compile_and_run,
+     ['memo001', ''])
 
-test('memo002',
-     [extra_run_opts('20'),
-      extra_clean(['Memo2.hi', 'Memo2.o'])],
-	multimod_compile_and_run, ['memo002',''])
+test('memo002', [extra_run_opts('20')], multimod_compile_and_run,
+     ['memo002', ''])
 
 test('stableptr001',
      [when(fast(), skip), extra_run_opts('+RTS -K8m -RTS')],