[commit: ghc] wip/T11028: Fixing tests (01f6e5f)

[git at git.haskell.org]

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

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/01f6e5f59ab42d60714712fe3eac855012c35d85/ghc

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

commit 01f6e5f59ab42d60714712fe3eac855012c35d85
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 27 21:33:39 2015 +0200

    Fixing tests


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

01f6e5f59ab42d60714712fe3eac855012c35d85
 compiler/typecheck/TcTyClsDecls.hs                 | 4 ++--
 testsuite/tests/ghc-api/annotations/T10399.stdout  | 2 --
 testsuite/tests/ghc-api/annotations/all.T          | 2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index c5c7c45..d40d3a4 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1427,8 +1427,8 @@ tcGadtSigType doc name ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = _b
        ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = gtvs ++ map (noLoc . UserTyVar . noLoc) tvs }
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
-              do { traceTc "tcConDecl" (doc <+> text "tvs:" <+> ppr hs_tvs)
-                 ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
+              do { traceTc "tcGadtSigType" (doc <+> text "tvs:" <+> ppr hs_tvs)
+                 ; traceTc "tcGadtSigType:" (text "res_ty:" <+> ppr res_ty)
                  ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs DataType hs_details
                  ; ty' <- tcHsLiftedType res_ty
diff --git a/testsuite/tests/ghc-api/annotations/T10399.stdout b/testsuite/tests/ghc-api/annotations/T10399.stdout
index 58a4093..612ecfd 100644
--- a/testsuite/tests/ghc-api/annotations/T10399.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10399.stdout
@@ -44,9 +44,7 @@
 ((Test10399.hs:15:45-46,AnnBang), [Test10399.hs:15:45]),
 ((Test10399.hs:15:45-46,AnnRarrow), [Test10399.hs:15:48-49]),
 ((Test10399.hs:15:45-64,AnnRarrow), [Test10399.hs:15:48-49]),
-((Test10399.hs:(16,5)-(17,69),AnnCloseP), [Test10399.hs:17:69]),
 ((Test10399.hs:(16,5)-(17,69),AnnDcolon), [Test10399.hs:16:12-13]),
-((Test10399.hs:(16,5)-(17,69),AnnOpenP), [Test10399.hs:16:27]),
 ((Test10399.hs:(16,15)-(17,69),AnnDot), [Test10399.hs:16:25]),
 ((Test10399.hs:(16,15)-(17,69),AnnForall), [Test10399.hs:16:15-20]),
 ((Test10399.hs:(16,27)-(17,69),AnnCloseP), [Test10399.hs:17:69]),
diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T
index 4104bce..c7c8542 100644
--- a/testsuite/tests/ghc-api/annotations/all.T
+++ b/testsuite/tests/ghc-api/annotations/all.T
@@ -16,7 +16,7 @@ test('T10358',      normal, run_command, ['$MAKE -s --no-print-directory T10358'
 test('T10278',      normal, run_command, ['$MAKE -s --no-print-directory T10278'])
 test('T10354',      normal, run_command, ['$MAKE -s --no-print-directory T10354'])
 test('T10396',      normal, run_command, ['$MAKE -s --no-print-directory T10396'])
-test('T10399',      expect_broken(11028), run_command, ['$MAKE -s --no-print-directory T10399'])
+test('T10399',      normal, run_command, ['$MAKE -s --no-print-directory T10399'])
 test('T10313',      normal, run_command, ['$MAKE -s --no-print-directory T10313'])
 test('T11018',      normal, run_command, ['$MAKE -s --no-print-directory T11018'])
 test('bundle-export', normal, run_command, ['$MAKE -s --no-print-directory bundle-export'])
diff --git a/testsuite/tests/ghc-api/landmines/landmines.stdout b/testsuite/tests/ghc-api/landmines/landmines.stdout
index db0b651..551b2cf 100644
--- a/testsuite/tests/ghc-api/landmines/landmines.stdout
+++ b/testsuite/tests/ghc-api/landmines/landmines.stdout
@@ -1,4 +1,4 @@
 (12,12,7)
-(66,62,0)
+(63,63,0)
 (13,13,7)
 (10,10,7)