diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-04-23 15:07:40 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-04-23 15:36:27 +0100 |
| commit | ef0d0b70a0546835c32bbfba564b875d8eb023c5 (patch) | |
| tree | d8a64a1edc28361b33c3a2c9e6c7ee813a222347 /testsuite/tests/ghci/scripts/all.T | |
| parent | a7bf4c0148b4c2dc1329eb21c428ca215c75ceab (diff) | |
| download | haskell-ef0d0b70a0546835c32bbfba564b875d8eb023c5.tar.gz | |
Add combined_output option.
Added an option to combine stdout and stderr into a single file. This is
useful for ghci scripts that produce interleaved errors and normal
output.
Also modified check_stderr_ok so that it normalizes stderr in the same
way as compile tests.
Diffstat (limited to 'testsuite/tests/ghci/scripts/all.T')
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index 2a49c9c112..bdec94ac97 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -2,15 +2,15 @@ setTestOpts(if_compiler_profiled(skip)) -test('ghci001', normal, ghci_script, ['ghci001.script']) -test('ghci002', normal, ghci_script, ['ghci002.script']) -test('ghci003', normal, ghci_script, ['ghci003.script']) -test('ghci004', normal, ghci_script, ['ghci004.script']) -test('ghci005', normal, ghci_script, ['ghci005.script']) -test('ghci006', normal, ghci_script, ['ghci006.script']) -test('ghci007', normal, ghci_script, ['ghci007.script']) -test('ghci008', normal, ghci_script, ['ghci008.script']) -test('ghci009', normal, ghci_script, ['ghci009.script']) +test('ghci001', combined_output, ghci_script, ['ghci001.script']) +test('ghci002', combined_output, ghci_script, ['ghci002.script']) +test('ghci003', combined_output, ghci_script, ['ghci003.script']) +test('ghci004', combined_output, ghci_script, ['ghci004.script']) +test('ghci005', combined_output, ghci_script, ['ghci005.script']) +test('ghci006', combined_output, ghci_script, ['ghci006.script']) +test('ghci007', combined_output, ghci_script, ['ghci007.script']) +test('ghci008', combined_output, ghci_script, ['ghci008.script']) +test('ghci009', combined_output, ghci_script, ['ghci009.script']) # Skip this test: deadlock can't be detected now, because we wait for # signals to arrive if there are signal handlers installed, and GHCi @@ -72,7 +72,7 @@ test('ghci051', normal, ghci_script, ['ghci051.script']) test('ghci052', normal, ghci_script, ['ghci052.script']) test('ghci053', normal, ghci_script, ['ghci053.script']) test('ghci054', normal, ghci_script, ['ghci054.script']) -test('ghci055', normal, ghci_script, ['ghci055.script']) +test('ghci055', combined_output, ghci_script, ['ghci055.script']) test('ghci056', [ @@ -107,7 +107,7 @@ test('T5045', normal, ghci_script, ['T5045.script']) test('T5130', normal, ghci_script, ['T5130.script']) test('T5417', normal, ghci_script, ['T5417.script']) test('T5545', normal, ghci_script, ['T5545.script']) -test('T5557', normal, ghci_script, ['T5557.script']) +test('T5557', combined_output, ghci_script, ['T5557.script']) test('T5566', normal, ghci_script, ['T5566.script']) test('GhciKinds', normal, ghci_script, ['GhciKinds.script']) test('T5564', normal, ghci_script, ['T5564.script']) |