diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
| commit | 172a59335fa6c76b17fb6795e87fbc7fcfd198e6 (patch) | |
| tree | 6e5e940cb2c6ae9110807fa0d637a280c63b4220 /testsuite/tests/ghci/scripts/all.T | |
| parent | 76c8fd674435a652c75a96c85abbf26f1f221876 (diff) | |
| download | haskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz | |
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'testsuite/tests/ghci/scripts/all.T')
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index 2cb93b8aac..1394a9af56 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -53,10 +53,12 @@ test('ghci022', normal, ghci_script, ['ghci022.script']) test('ghci023', normal, ghci_script, ['ghci023.script']) test('ghci024', [req_interp, when(fast(), skip)], - makefile_test, []) + run_command, + ['$MAKE -s --no-print-directory ghci024']) test('T9367', [req_interp, when(fast() or config.os != 'mingw32', skip)], - makefile_test, []) + run_command, + ['$MAKE -s --no-print-directory T9367']) test('ghci025', extra_files(['Ghci025B.hs', 'Ghci025C.hs', 'Ghci025D.hs']), ghci_script, ['ghci025.script']) test('ghci026', extra_files(['../prog002']), ghci_script, ['ghci026.script']) @@ -70,7 +72,7 @@ test('ghci033', normal, ghci_script, ['ghci033.script']) test('ghci034', normal, ghci_script, ['ghci034.script']) test('ghci035', normal, ghci_script, ['ghci035.script']) test('ghci036', normal, ghci_script, ['ghci036.script']) -test('ghci037', req_interp, makefile_test, []) +test('ghci037', req_interp, run_command, ['$MAKE -s --no-print-directory ghci037']) test('ghci038', extra_files(['../shell.hs']), ghci_script, ['ghci038.script']) test('ghci039', normal, ghci_script, ['ghci039.script']) test('ghci040', normal, ghci_script, ['ghci040.script']) @@ -217,7 +219,8 @@ test('T10122', normal, ghci_script, ['T10122.script']) test('T10321', normal, ghci_script, ['T10321.script']) -test('T10408', req_interp, makefile_test, []) +test('T10408', req_interp, run_command, + ['$MAKE -s --no-print-directory T10408']) test('T10248', normal, ghci_script, ['T10248.script']) test('T10110', normal, ghci_script, ['T10110.script']) test('T10322', normal, ghci_script, ['T10322.script']) @@ -241,7 +244,7 @@ test('T11051a', normal, ghci_script, ['T11051a.script']) test('T11051b', normal, ghci_script, ['T11051b.script']) test('T11266', ignore_stdout, ghci_script, ['T11266.script']) -test('T11389', req_interp, makefile_test, []) +test('T11389', req_interp, run_command, ['$MAKE -s --no-print-directory T11389']) test('T11524a', normal, ghci_script, ['T11524a.script']) test('T11456', normal, ghci_script, ['T11456.script']) test('TypeAppData', normal, ghci_script, ['TypeAppData.script']) @@ -252,7 +255,8 @@ test('T11975', normal, ghci_script, ['T11975.script']) test('T10963', normal, ghci_script, ['T10963.script']) test('T11721', normal, ghci_script, ['T11721.script']) test('T12005', normal, ghci_script, ['T12005.script']) -test('T12023', normal, makefile_test, []) +test('T12023', normal, run_command, + ['$MAKE -s --no-print-directory T12023']) test('T12520', normal, ghci_script, ['T12520.script']) test('T12091', [extra_run_opts('-fobject-code')], ghci_script, ['T12091.script']) |