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/safeHaskell | |
| 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/safeHaskell')
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p12.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p12.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p13.stdout | 0 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p2.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p2.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p3.stderr | 1 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p3.stdout | 1 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p5.stderr (renamed from testsuite/tests/safeHaskell/ghci/p5.stdout) | 0 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p7.stderr (renamed from testsuite/tests/safeHaskell/ghci/p7.stdout) | 0 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p8.stderr (renamed from testsuite/tests/safeHaskell/ghci/p8.stdout) | 0 |
10 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/safeHaskell/ghci/p12.stderr b/testsuite/tests/safeHaskell/ghci/p12.stderr index 4df01fd599..4f3e0106df 100644 --- a/testsuite/tests/safeHaskell/ghci/p12.stderr +++ b/testsuite/tests/safeHaskell/ghci/p12.stderr @@ -1,3 +1,5 @@ +don't know how to reverse -XSafe +Some flags have not been recognized: -fno-package-trust <no location info>: Data.ByteString: Can't be safely imported! diff --git a/testsuite/tests/safeHaskell/ghci/p12.stdout b/testsuite/tests/safeHaskell/ghci/p12.stdout deleted file mode 100644 index 5d16ff7a9f..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p12.stdout +++ /dev/null @@ -1,2 +0,0 @@ -don't know how to reverse -XSafe -Some flags have not been recognized: -fno-package-trust diff --git a/testsuite/tests/safeHaskell/ghci/p13.stdout b/testsuite/tests/safeHaskell/ghci/p13.stdout deleted file mode 100644 index e69de29bb2..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p13.stdout +++ /dev/null diff --git a/testsuite/tests/safeHaskell/ghci/p2.stderr b/testsuite/tests/safeHaskell/ghci/p2.stderr index 342bb05686..0b446d53f6 100644 --- a/testsuite/tests/safeHaskell/ghci/p2.stderr +++ b/testsuite/tests/safeHaskell/ghci/p2.stderr @@ -1,2 +1,4 @@ package flags have changed, resetting and loading new packages... package flags have changed, resetting and loading new packages... +cannot satisfy -package -all + (use -v for more information) diff --git a/testsuite/tests/safeHaskell/ghci/p2.stdout b/testsuite/tests/safeHaskell/ghci/p2.stdout deleted file mode 100644 index c6efa9ed48..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p2.stdout +++ /dev/null @@ -1,2 +0,0 @@ -cannot satisfy -package -all - (use -v for more information) diff --git a/testsuite/tests/safeHaskell/ghci/p3.stderr b/testsuite/tests/safeHaskell/ghci/p3.stderr index 8e4ee4018c..72fbb805d0 100644 --- a/testsuite/tests/safeHaskell/ghci/p3.stderr +++ b/testsuite/tests/safeHaskell/ghci/p3.stderr @@ -2,6 +2,7 @@ <no location info>: System.IO.Unsafe: Can't be safely imported! The module itself isn't safe. +can't import System.IO.Unsafe as it isn't trusted. <no location info>: Data.ByteString: Can't be safely imported! diff --git a/testsuite/tests/safeHaskell/ghci/p3.stdout b/testsuite/tests/safeHaskell/ghci/p3.stdout deleted file mode 100644 index 268f05e8d9..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p3.stdout +++ /dev/null @@ -1 +0,0 @@ -can't import System.IO.Unsafe as it isn't trusted. diff --git a/testsuite/tests/safeHaskell/ghci/p5.stdout b/testsuite/tests/safeHaskell/ghci/p5.stderr index 3f649f7b60..3f649f7b60 100644 --- a/testsuite/tests/safeHaskell/ghci/p5.stdout +++ b/testsuite/tests/safeHaskell/ghci/p5.stderr diff --git a/testsuite/tests/safeHaskell/ghci/p7.stdout b/testsuite/tests/safeHaskell/ghci/p7.stderr index 674794fdac..674794fdac 100644 --- a/testsuite/tests/safeHaskell/ghci/p7.stdout +++ b/testsuite/tests/safeHaskell/ghci/p7.stderr diff --git a/testsuite/tests/safeHaskell/ghci/p8.stdout b/testsuite/tests/safeHaskell/ghci/p8.stderr index 8280f4a6b0..8280f4a6b0 100644 --- a/testsuite/tests/safeHaskell/ghci/p8.stdout +++ b/testsuite/tests/safeHaskell/ghci/p8.stderr |