summaryrefslogtreecommitdiff
path: root/testsuite/tests/safeHaskell
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2021-07-08 11:02:43 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-07-09 08:47:22 -0400
commit2d4cdfda6a7f068fe4a1cf586ccb2866b35e0250 (patch)
tree9b308c925d387cada0126db89850a9820ab9307c /testsuite/tests/safeHaskell
parent60fabd7eb3e3450636673d818075da19074ddad0 (diff)
downloadhaskell-2d4cdfda6a7f068fe4a1cf586ccb2866b35e0250.tar.gz
Avoid unsafePerformIO for getProgName
getProgName was used to append the name of the program (e.g. "ghc") to printed error messages in the Show instance of GhcException. It doesn't belong here as GHCi and GHC API users may want to override this behavior by setting a different error handler. So we now call it in the defaultErrorHandler instead.
Diffstat (limited to 'testsuite/tests/safeHaskell')
-rw-r--r--testsuite/tests/safeHaskell/ghci/p5.stderr4
-rw-r--r--testsuite/tests/safeHaskell/ghci/p7.stderr2
-rw-r--r--testsuite/tests/safeHaskell/ghci/p8.stderr2
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/safeHaskell/ghci/p5.stderr b/testsuite/tests/safeHaskell/ghci/p5.stderr
index 7e70988612..6579b9f765 100644
--- a/testsuite/tests/safeHaskell/ghci/p5.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p5.stderr
@@ -1,7 +1,7 @@
Some flags have not been recognized: -XNoSafe
-ghc-stage2: <no location info>: Incompatible Safe Haskell flags! (Safe, Trustworthy)
+<no location info>: Incompatible Safe Haskell flags! (Safe, Trustworthy)
Usage: For basic information, try the `--help' option.
Some flags have not been recognized: -XNoTrustworthy
-ghc-stage2: <no location info>: Incompatible Safe Haskell flags! (Safe, Unsafe)
+<no location info>: Incompatible Safe Haskell flags! (Safe, Unsafe)
Usage: For basic information, try the `--help' option.
Some flags have not been recognized: -XNoUnsafe
diff --git a/testsuite/tests/safeHaskell/ghci/p7.stderr b/testsuite/tests/safeHaskell/ghci/p7.stderr
index 674794fdac..99237ce045 100644
--- a/testsuite/tests/safeHaskell/ghci/p7.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p7.stderr
@@ -1,2 +1,2 @@
-ghc-stage2: A.hs:1:14-24: Incompatible Safe Haskell flags! (Safe, Trustworthy)
+A.hs:1:14-24: Incompatible Safe Haskell flags! (Safe, Trustworthy)
Usage: For basic information, try the `--help' option.
diff --git a/testsuite/tests/safeHaskell/ghci/p8.stderr b/testsuite/tests/safeHaskell/ghci/p8.stderr
index 8280f4a6b0..e82c75a59c 100644
--- a/testsuite/tests/safeHaskell/ghci/p8.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p8.stderr
@@ -1,2 +1,2 @@
-ghc-stage2: B.hs:1:14-19: Incompatible Safe Haskell flags! (Safe, Unsafe)
+B.hs:1:14-19: Incompatible Safe Haskell flags! (Safe, Unsafe)
Usage: For basic information, try the `--help' option.