summaryrefslogtreecommitdiff
path: root/testsuite/tests/stranal/should_compile/Makefile
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2015-12-15 16:08:52 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-15 20:45:59 +0100
commite2c917381ff099820b1ee30fcfa8bc0c20cf5c1f (patch)
treef9295bd3f9ab1e4d4b296960d1f046d1eb37b449 /testsuite/tests/stranal/should_compile/Makefile
parent947e44feebb4e979d7d476ff2aa5c7054a1c0899 (diff)
downloadhaskell-e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f.tar.gz
Narrow scope of special-case for unqualified printing of names in core libraries
Commit 547c597112954353cef7157cb0a389bc4f6303eb modifies the pretty-printer to render names from a set of core packages (`base`, `ghc-prim`, `template-haskell`) as unqualified. The idea here was that many of these names typically are not in scope but are well-known by the user and therefore qualification merely introduces noise. This, however, is a very large hammer and potentially breaks any consumer who relies on parsing GHC output (hence #11208). This commit partially reverts this change, now only printing `Constraint` (which appears quite often in errors) as unqualified. Fixes #11208. Updates tests in `array` submodule. Test Plan: validate Reviewers: hvr, thomie, austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1619 GHC Trac Issues: #11208
Diffstat (limited to 'testsuite/tests/stranal/should_compile/Makefile')
-rw-r--r--testsuite/tests/stranal/should_compile/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/tests/stranal/should_compile/Makefile b/testsuite/tests/stranal/should_compile/Makefile
index c187ddcdc4..c7ef4304ae 100644
--- a/testsuite/tests/stranal/should_compile/Makefile
+++ b/testsuite/tests/stranal/should_compile/Makefile
@@ -8,11 +8,13 @@ include $(TOP)/mk/test.mk
# with two unboxed args. See Trac #10482 for background
T10482:
$(RM) -f T10482.o T10482.hi
- '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl T10482.hs | grep 'T10482.*wfoo.*Int'
+ # Set -dppr-cols to ensure output doesn't wrap
+ '$(TEST_HC)' $(TEST_HC_OPTS) -dppr-cols=200 -O -c -ddump-simpl T10482.hs | grep 'T10482.*wfoo.*Int'
T10482a:
$(RM) -f T10482a.o T10482a.hi
- '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl T10482a.hs | grep 'wf.*Int'
+ # Set -dppr-cols to ensure output doesn't wrap
+ '$(TEST_HC)' $(TEST_HC_OPTS) -dppr-cols=200 -O -c -ddump-simpl T10482a.hs | grep 'wf.*Int'
T10694:
$(RM) -f T10694.o