testsuite: Use makefile_test

testsuite/tests/cabal/t19518/all.T

-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('t19518',
      [ extra_files(['Setup.hs', 'p/', 'q/', 'r/'])
      , js_broken(22349)
      ],
-     run_command,
-     ['$MAKE -s --no-print-directory t19518 ' + cleanup])
+     makefile_test,
+     [])

testsuite/tests/cabal/t20242/all.T

-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T20242',
      [extra_files(['Setup.hs', 'BootNoHeader.cabal','Foo.hs', 'Foo.hs-boot', 'Main.hs'])],
-     run_command,
-     ['$MAKE -s --no-print-directory T20242 ' + cleanup])
+     makefile_test,
+     [])

testsuite/tests/driver/T16500/all.T

-test('T16500', [extra_files(['A.hs','B.hs',]),], run_command, ['$MAKE -s --no-print-directory T16500'])
+test('T16500', [extra_files(['A.hs','B.hs',]),], makefile_test, [])

testsuite/tests/driver/dynamicToo/dynamicToo006/all.T

 test('dynamicToo006',
      [normalise_slashes, extra_files(['Main.hs']), unless(have_dynamic(), skip)],
-     run_command, ['$MAKE -s main --no-print-director'])
+     makefile_test, ['main'])

testsuite/tests/driver/multipleHomeUnits/different-db/all.T

-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('different-db',
      [ extra_files(['p/', 'q/', 'r/', 'p1/', 'unitP', 'unitQ', 'unitR', 'unitP1', 'Setup.hs'])
      , js_broken(22349)
      ],
-     run_command,
-     ['$MAKE -s --no-print-directory different-db ' + cleanup])
+     makefile_test,
+     [])

testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T

-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('mhu-closure',
      [ extra_files(['p/', 'q/', 'r/', 'r1/', 'unitP', 'unitQ', 'unitR', 'unitR1', 'Setup.hs'])
      , js_broken(22349)
      ],
-     run_command,
-     ['$MAKE -s --no-print-directory mhu-closure ' + cleanup])
+     makefile_test,
+     [])

testsuite/tests/runghc/all.T

@@ -9,9 +9,9 @@ test('T6132', [],
 
 test('T17171a',
      [req_interp, exit_code(2), ignore_stdout, grep_errmsg(r'main')],
-     run_command, ['$MAKE -s --no-print-directory T17171a'])
-test('T17171b', req_interp, run_command,
-     ['$MAKE -s --no-print-directory T17171b'])
+     makefile_test, [])
+
+test('T17171b', req_interp, makefile_test, [])
 
 test('T-signals-child',
      [ when(opsys('mingw32'), skip), req_interp

testsuite/tests/showIface/all.T

 test('Orphans', normal, makefile_test, ['Orphans'])
-test('DocsInHiFile0',
-     extra_files(['DocsInHiFile.hs']),
-     makefile_test, ['DocsInHiFile0'])
-test('DocsInHiFile1',
-     extra_files(['DocsInHiFile.hs']),
-     makefile_test, ['DocsInHiFile1'])
+test('DocsInHiFile0', extra_files(['DocsInHiFile.hs']), makefile_test, [])
+test('DocsInHiFile1', extra_files(['DocsInHiFile.hs']), makefile_test, [])
 test('T17871', [extra_files(['T17871a.hs'])], multimod_compile, ['T17871', '-v0'])
 test('DocsInHiFileTH',
      [extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), req_th],
-     makefile_test, ['DocsInHiFileTH'])
-test('NoExportList',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory NoExportList'])
-test('PragmaDocs',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory PragmaDocs'])
-test('HaddockOpts',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory HaddockOpts'])
-test('LanguageExts',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory LanguageExts'])
-test('ReExports',
-     extra_files(['Inner0.hs', 'Inner1.hs', 'Inner2.hs', 'Inner3.hs', 'Inner4.hs']),
-     run_command,
-     ['$MAKE -s --no-print-directory ReExports'])
-test('HaddockIssue849',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory HaddockIssue849'])
-test('MagicHashInHaddocks',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory MagicHashInHaddocks'])
+     makefile_test, [])
+test('NoExportList', normal, makefile_test, [])
+test('PragmaDocs', normal, makefile_test, [])
+test('HaddockOpts', normal, makefile_test, [])
+test('LanguageExts', normal, makefile_test, [])
+test('ReExports', extra_files(['Inner0.hs', 'Inner1.hs', 'Inner2.hs', 'Inner3.hs', 'Inner4.hs']), makefile_test, [])
+test('HaddockIssue849', normal, makefile_test, [])
+test('MagicHashInHaddocks', normal, makefile_test, [])

testsuite/tests/unboxedsums/module/all.T

 test('sum_mod', [normalise_slashes, extra_files(['Lib.hs', 'Main.hs'])],
-     run_command, ['$MAKE -s main --no-print-director'])
+     makefile_test, ['main'])