testsuite: Use makefile_test

5795b365 · Ben Gamari · Marge Bot · 37ad04e8 · 5795b365 · 5795b365
Commit 5795b365 authored 1 year ago by Ben Gamari Committed by Marge Bot 1 year ago
--- a/testsuite/tests/backpack/cabal/T14304/all.T
+++ b/testsuite/tests/backpack/cabal/T14304/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T14304',
     [extra_files(['p', 'indef', 'th', 'Setup.hs']),
      unless(have_dynamic(), skip)],
-     run_command,
-     ['$MAKE -s --no-print-directory T14304 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/T15594/all.T
+++ b/testsuite/tests/backpack/cabal/T15594/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T15594',
     [extra_files(['Setup.hs', 'Stuff.hs', 'Sig.hsig', 'pkg.cabal', 'src'])],
-     run_command,
-     ['$MAKE -s --no-print-directory T15594 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/T16219/all.T
+++ b/testsuite/tests/backpack/cabal/T16219/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T16219',
     [ extra_files(['Setup.hs', 'backpack-issue.cabal', 'library-a', 'library-a-impl', 'library-b'])
     , when(opsys('mingw32'), fragile(17452))
     , js_broken(22349)
     ],
-     run_command,
-     ['$MAKE -s --no-print-directory T16219 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/T20509/all.T
+++ b/testsuite/tests/backpack/cabal/T20509/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T20509',
     [extra_files(['p', 'q', 'T20509.cabal', 'Setup.hs'])
     , run_timeout_multiplier(2)
     ],
-     run_command,
-     ['$MAKE -s --no-print-directory T20509 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal01/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal01/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal01',
     [extra_files(['p', 'q', 'impl', 'bkpcabal01.cabal', 'Setup.hs', 'Main.hs']),
      js_broken(22349),
      run_timeout_multiplier(2)],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal01 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal02/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal02/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal02',
     [extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']),
      normalise_version('bkpcabal01')],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal02 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal03/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal03/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal03',
     [extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs'])],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal03 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal04/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal04/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 # Test recompilation checking on signatures
 test('bkpcabal04',
     [extra_files(['p', 'q', 'bkpcabal04.cabal.in1', 'bkpcabal04.cabal.in2', 'Setup.hs'])],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal04 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal05/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal05/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal05',
     [extra_files(['bkpcabal05.cabal', 'A.hsig.in1', 'A.hsig.in2', 'M.hs', 'Setup.hs'])],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal05 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal06/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal06/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal06',
     [extra_files(['bkpcabal06.cabal', 'Setup.hs', 'sig', 'impl']),
      js_broken(22349),
      when(opsys('mingw32'), skip)],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal06 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/backpack/cabal/bkpcabal08/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal08/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('bkpcabal08',
     [extra_files(['p', 'q', 'impl', 'bkpcabal08.cabal', 'Setup.hs', 'R.hs']),
      js_broken(22351), 
      fragile(23648),
      normalise_slashes,
      normalise_version('bkpcabal08')],
-     run_command,
-     ['$MAKE -s --no-print-directory bkpcabal08 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/T12733/all.T
+++ b/testsuite/tests/cabal/T12733/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T12733',
     [extra_files(['p/', 'q/', 'Setup.hs'])
     , js_broken(22349)
     ],
-     run_command,
-     ['$MAKE -s --no-print-directory T12733 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/cabal03/all.T
+++ b/testsuite/tests/cabal/cabal03/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('cabal03',
     [extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
     js_broken(22349)],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal03 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/cabal05/all.T
+++ b/testsuite/tests/cabal/cabal05/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('cabal05',
     [extra_files(['Setup.hs', 'p/', 'q/', 'r/', 's/', 't/']),
     js_broken(22349)],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal05 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/cabal06/all.T
+++ b/testsuite/tests/cabal/cabal06/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('cabal06',
     [extra_files(['Setup.hs', 'p-1.0/', 'p-1.1/', 'q/', 'r/']),
     js_broken(22349)],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal06 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/cabal08/all.T
+++ b/testsuite/tests/cabal/cabal08/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('cabal08',
     [extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
     js_broken(22349)],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal08 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/cabal09/all.T
+++ b/testsuite/tests/cabal/cabal09/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
-test('cabal09',
-     [extra_files(['Main.hs', 'Setup.hs', 'reexport.cabal'])],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal09 ' + cleanup])
+test('cabal09', [extra_files(['Main.hs', 'Setup.hs', 'reexport.cabal'])], makefile_test, [])
--- a/testsuite/tests/cabal/cabal10/all.T
+++ b/testsuite/tests/cabal/cabal10/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('cabal10',
     [extra_files(['Use.hs', 'Setup.hs', 'src/', 'internal-lib.cabal']),
     js_broken(22349)],
-     run_command,
-     ['$MAKE -s --no-print-directory cabal10 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/sigcabal01/all.T
+++ b/testsuite/tests/cabal/sigcabal01/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('sigcabal01',
     [extra_files(['Main.hs', 'Setup.hs', 'p/']), expect_broken(10622)],
-     run_command,
-     ['$MAKE -s --no-print-directory sigcabal01 ' + cleanup])
+     makefile_test,
+     [])
--- a/testsuite/tests/cabal/t18567/all.T
+++ b/testsuite/tests/cabal/t18567/all.T
-if config.cleanup:
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = 'CLEANUP=0'
-
 test('T18567',
     [ extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal'])
     , js_broken(22349)
     , normalise_version('internal-lib')
     ],
-     run_command,
-     ['$MAKE -s --no-print-directory T18567 ' + cleanup])
+     makefile_test,
+     [])