diff options
| author | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
| commit | 76c8fd674435a652c75a96c85abbf26f1f221876 (patch) | |
| tree | b02a6f5307a20efc25ddb27c58977069b48972b6 /testsuite/tests/ghc-e | |
| parent | 7cdcd3e12a5c3a337e36fa80c64bd72e5ef79b24 (diff) | |
| download | haskell-76c8fd674435a652c75a96c85abbf26f1f221876.tar.gz | |
Batch merge
Diffstat (limited to 'testsuite/tests/ghc-e')
| -rw-r--r-- | testsuite/tests/ghc-e/should_fail/all.T | 21 | ||||
| -rw-r--r-- | testsuite/tests/ghc-e/should_run/all.T | 29 |
2 files changed, 21 insertions, 29 deletions
diff --git a/testsuite/tests/ghc-e/should_fail/all.T b/testsuite/tests/ghc-e/should_fail/all.T index 9a75481621..76f9afe0a8 100644 --- a/testsuite/tests/ghc-e/should_fail/all.T +++ b/testsuite/tests/ghc-e/should_fail/all.T @@ -1,23 +1,16 @@ -test('T7962', req_interp, run_command, - ['$MAKE --no-print-directory -s T7962']) +test('T7962', req_interp, makefile_test, ['T7962']) -test('T9905fail1', req_interp, run_command, - ['$MAKE --no-print-directory -s T9905fail1']) +test('T9905fail1', req_interp, makefile_test, ['T9905fail1']) -test('T9905fail2', req_interp, run_command, - ['$MAKE --no-print-directory -s T9905fail2']) +test('T9905fail2', req_interp, makefile_test, ['T9905fail2']) -test('T9905fail3', req_interp, run_command, - ['$MAKE --no-print-directory -s T9905fail3']) +test('T9905fail3', req_interp, makefile_test, ['T9905fail3']) -test('ghc-e-fail1', req_interp, run_command, - ['$MAKE --no-print-directory -s ghc-e-fail1']) +test('ghc-e-fail1', req_interp, makefile_test, ['ghc-e-fail1']) -test('ghc-e-fail2', req_interp, run_command, - ['$MAKE --no-print-directory -s ghc-e-fail2']) +test('ghc-e-fail2', req_interp, makefile_test, ['ghc-e-fail2']) # Don't run on Windows, as executable is written to T9930.exe # and no failure is induced. test('T9930fail', [extra_files(['T9930']), when(opsys('mingw32'), skip)], - run_command, - ['$MAKE --no-print-directory -s T9930fail']) + makefile_test, ['T9930fail']) diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index a10fb0d816..a2e50ab9ec 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -1,19 +1,18 @@ -test('ghc-e001', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e001']) -test('ghc-e002', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e002']) -test('ghc-e003', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e003']) -test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e004']) -test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) -test('ghc-e006', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e006']) +test('ghc-e001', req_interp, makefile_test, ['ghc-e001']) +test('ghc-e002', req_interp, makefile_test, ['ghc-e002']) +test('ghc-e003', req_interp, makefile_test, ['ghc-e003']) +test('ghc-e004', req_interp, makefile_test, ['ghc-e004']) +test('ghc-e005', req_interp, makefile_test, ['ghc-e005']) +test('ghc-e006', req_interp, makefile_test, ['ghc-e006']) test('T2228', [req_interp, when(ghc_dynamic(), expect_broken(7298))], - run_command, - ['$MAKE --no-print-directory -s T2228']) -test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636']) -test('T3890', req_interp, run_command, ['$MAKE --no-print-directory -s T3890']) -test('T7299', req_interp, run_command, ['$MAKE --no-print-directory -s T7299']) -test('T9086', req_interp, run_command, ['$MAKE --no-print-directory -s T9086']) -test('T9905', req_interp, run_command, ['$MAKE --no-print-directory -s T9905']) -test('T9905b', req_interp, run_command, ['$MAKE --no-print-directory -s T9905b']) -test('T11478', req_interp, run_command, ['$MAKE --no-print-directory -s T11478']) + makefile_test, ['T2228']) +test('T2636', req_interp, makefile_test, ['T2636']) +test('T3890', req_interp, makefile_test, ['T3890']) +test('T7299', req_interp, makefile_test, ['T7299']) +test('T9086', req_interp, makefile_test, ['T9086']) +test('T9905', req_interp, makefile_test, ['T9905']) +test('T9905b', req_interp, makefile_test, ['T9905b']) +test('T11478', req_interp, makefile_test, ['T11478']) |