summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2018-07-17 13:02:48 -0400
committerJoachim Breitner <mail@joachim-breitner.de>2018-07-17 13:02:48 -0400
commitb32988f79b8025dfa6ef67f83b8360741b878abc (patch)
tree26b021a6272aeff6016a66752494e5d9558cf589
parentf20381d3431016ee4212f7761992ecc4cfe5440e (diff)
downloadhaskell-wip/T15050.tar.gz
Update more test outputwip/T15050
-rw-r--r--testsuite/tests/typecheck/should_compile/all.T2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc141.stderr7
2 files changed, 4 insertions, 5 deletions
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 8f14be2c8f..7ae70075e6 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -620,7 +620,7 @@ test('SplitWD', normal, compile, [''])
# (2) Build the program twice: once with -dynamic, and then
# with -prof using -osuf to set a different object file suffix.
test('T14441', omit_ways(['profasm']), compile, [''])
-test('T15050', [expect_broken(15050)], compile, [''])
+test('T15050', normal, compile, [''])
test('T14735', normal, compile, [''])
test('T15180', normal, compile, [''])
test('T15232', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index f964303c30..f0cfdefd03 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -38,13 +38,12 @@ tc141.hs:13:13: error:
tc141.hs:15:18: error:
• Couldn't match expected type ‘a1’ with actual type ‘p1’
- because type variable ‘a1’ would escape its scope
- This (rigid, skolem) type variable is bound by
+ ‘a1’ is a rigid type variable bound by
the type signature for:
v :: forall a1. a1
at tc141.hs:14:14-19
- ‘p’ is a rigid type variable bound by
- the inferred type of g :: a -> p -> a1
+ ‘p1’ is a rigid type variable bound by
+ the inferred type of g :: p -> p1 -> a
at tc141.hs:(13,1)-(16,13)
• In the expression: b
In an equation for ‘v’: v = b