diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-09-21 19:18:56 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-09-21 19:24:47 -0500 |
| commit | 0b852fcf74c65291aeb6357973ecb715735d6383 (patch) | |
| tree | d92dddac04d543cb5811a4f689649ef846375f15 /testsuite/driver | |
| parent | 83e23c1a4cce36de68c3c8323d27f24182b33f34 (diff) | |
| download | haskell-0b852fcf74c65291aeb6357973ecb715735d6383.tar.gz | |
base: use Show for ErrorCall in uncaughtExceptionHandler
The default top-level exception handler now uses the `Show` instance for
`ErrorCall` when printing exceptions, so it will actually print the out-of-band
data (e.g. `CallStack`s) in compiled binaries, instead of just printing the
error message.
This also updates the hpc submodule to fix the test output.
Reviewed By: austin, thomie
Differential Revision: https://phabricator.haskell.org/D1217
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testlib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 34a3fb8754..5ca17f2484 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1691,9 +1691,9 @@ def normalise_callstacks(str): def repl(matches): location = matches.group(1) location = normalise_slashes_(location) - return ', called at {}:<line>:<column> in'.format(location) + return ', called at {}:<line>:<column> in <package-id>:'.format(location) # Ignore line number differences in call stacks (#10834). - return re.sub(', called at (.+):[\\d]+:[\\d]+ in', repl, str) + return re.sub(', called at (.+):[\\d]+:[\\d]+ in [\\w\-\.]+:', repl, str) def normalise_errmsg( str ): # remove " error:" and lower-case " Warning:" to make patch for |