[commit: testsuite] master: Merge New Template Haskell branch. (b141e5e)

[git at git.haskell.org]

Repository : ssh://git at git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b141e5e42a4d478a75865083c55a6e050a0c49aa/testsuite

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

commit b141e5e42a4d478a75865083c55a6e050a0c49aa
Merge: 8012433 c0e50e9
Author: Geoffrey Mainland <mainland at apeiron.net>
Date:   Fri Oct 4 17:55:21 2013 -0400

    Merge New Template Haskell branch.



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

b141e5e42a4d478a75865083c55a6e050a0c49aa
 tests/ghci/scripts/T4127a.stderr                 |    6 ++++
 tests/ghci/scripts/all.T                         |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang12.stderr |    1 +
 tests/th/T1835.hs                                |    2 ++
 tests/th/T2222.hs                                |    6 ++++
 tests/th/T2222.stderr                            |    2 +-
 tests/th/T2597b.stderr                           |    1 -
 tests/th/T3177a.stderr                           |    6 ++--
 tests/th/T3395.stderr                            |    6 ----
 tests/th/T3920.hs                                |    2 ++
 tests/th/T5358.hs                                |    2 ++
 tests/th/T5358.stderr                            |   36 +---------------------
 tests/th/T5795.stderr                            |    1 -
 tests/th/T5971.stderr                            |    1 -
 tests/th/T6114.stderr                            |    5 ---
 tests/th/T7532.stderr                            |    2 +-
 tests/th/T7910.hs                                |    2 ++
 tests/th/TH_1tuple.stderr                        |    1 -
 tests/th/TH_dataD1.hs                            |    3 +-
 tests/th/TH_dataD1.stderr                        |    3 --
 tests/th/TH_import_loop/TH_import_loop.T         |    2 +-
 tests/th/TH_lookupName.hs                        |    2 ++
 tests/th/TH_reifyDecl1.hs                        |    2 ++
 tests/th/TH_reifyInstances.hs                    |    2 ++
 tests/th/TH_runIO.stderr                         |    1 -
 tests/th/TH_unresolvedInfix2.hs                  |    2 ++
 tests/th/TH_unresolvedInfix2.stderr              |    8 +----
 tests/th/all.T                                   |    2 +-
 28 files changed, 40 insertions(+), 71 deletions(-)