summaryrefslogtreecommitdiff
path: root/testsuite/tests/ghci/should_run/all.T
diff options
context:
space:
mode:
authorPaolo Capriotti <p.capriotti@gmail.com>2012-04-23 15:07:40 +0100
committerPaolo Capriotti <p.capriotti@gmail.com>2012-04-23 15:36:27 +0100
commitef0d0b70a0546835c32bbfba564b875d8eb023c5 (patch)
treed8a64a1edc28361b33c3a2c9e6c7ee813a222347 /testsuite/tests/ghci/should_run/all.T
parenta7bf4c0148b4c2dc1329eb21c428ca215c75ceab (diff)
downloadhaskell-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/should_run/all.T')
-rw-r--r--testsuite/tests/ghci/should_run/all.T3
1 files changed, 2 insertions, 1 deletions
diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index f6e2c146be..89347ebc85 100644
--- a/testsuite/tests/ghci/should_run/all.T
+++ b/testsuite/tests/ghci/should_run/all.T
@@ -13,7 +13,8 @@ test('2881', just_ghci, compile_and_run, [''])
test('3171',
[if_platform('i386-unknown-mingw32',skip),
- req_interp],
+ req_interp,
+ combined_output],
run_command,
['$MAKE -s --no-print-directory 3171'])