[commit: ghc] master: Fix up tests for #13594 (3e79fe4)

git at git.haskell.org git at git.haskell.org
Thu May 11 21:34:02 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e79fe42b907653d97cd3a5496a8f133320354eb/ghc

>---------------------------------------------------------------

commit 3e79fe42b907653d97cd3a5496a8f133320354eb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu May 11 17:30:31 2017 -0400

    Fix up tests for #13594
    
    This adds the GHCi variant of the failing program in #13594. Also, I
    inadvertently changed the T13594 test previously introduced in a way that made
    it no longer faithfully test the ticket as written. Fix this.


>---------------------------------------------------------------

3e79fe42b907653d97cd3a5496a8f133320354eb
 testsuite/tests/parser/should_compile/all.T                    | 1 -
 testsuite/tests/{parser => typecheck}/should_compile/T13594.hs | 2 +-
 testsuite/tests/typecheck/should_run/T13594a.script            | 2 ++
 testsuite/tests/typecheck/should_run/all.T                     | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 5cf615e..2059979 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -107,4 +107,3 @@ test('T10582', expect_broken(10582), compile, [''])
 test('DumpParsedAst',      normal, compile, ['-dsuppress-uniques -ddump-parsed-ast'])
 test('DumpRenamedAst',     normal, compile, ['-dsuppress-uniques -ddump-rn-ast'])
 test('DumpTypecheckedAst', normal, compile, ['-dsuppress-uniques -ddump-tc-ast'])
-test('T13594', normal, compile, [''])
diff --git a/testsuite/tests/parser/should_compile/T13594.hs b/testsuite/tests/typecheck/should_compile/T13594.hs
similarity index 79%
rename from testsuite/tests/parser/should_compile/T13594.hs
rename to testsuite/tests/typecheck/should_compile/T13594.hs
index 386d9c7..998d473 100644
--- a/testsuite/tests/parser/should_compile/T13594.hs
+++ b/testsuite/tests/typecheck/should_compile/T13594.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE NoMonomorphismRestriction #-}
+
 module Bug where
 
 x :: forall a b. (a ~ Integer, b ~ Integer) => (a, b)
diff --git a/testsuite/tests/typecheck/should_run/T13594a.script b/testsuite/tests/typecheck/should_run/T13594a.script
new file mode 100644
index 0000000..dd1b92a
--- /dev/null
+++ b/testsuite/tests/typecheck/should_run/T13594a.script
@@ -0,0 +1,2 @@
+:set -XBangPatterns -XRankNTypes  -XTypeFamilies
+let x :: forall a . a ~ Integer => forall b. b ~ Integer => (a, b); !x = (1, 2)
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index 0690f67..c8e921f 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -122,3 +122,5 @@ test('Typeable1', normal, compile_fail, [''])
 test('TypeableEq', normal, compile_and_run, [''])
 test('T13435', normal, compile_and_run, [''])
 test('T11715', exit_code(1), compile_and_run, [''])
+test('T13594', expect_broken(13594), compile, [''])
+test('T13594a', expect_broken(13594), ghci_script, ['T13594a.script'])



More information about the ghc-commits mailing list