[commit: testsuite] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (141953e)

Iavor Diatchki diatchki at galois.com
Mon Mar 4 00:29:57 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/141953e2c1c69a3fff85b0b483bf6a5786dfd88f

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

commit 141953e2c1c69a3fff85b0b483bf6a5786dfd88f
Merge: 080d920... a6adff8...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Mar 3 15:29:01 2013 -0800

    Merge remote-tracking branch 'origin/master' into type-nats
    
    Conflicts:
    	tests/typecheck/should_compile/all.T

 .gitignore                                         |   86 +++
 config/ghc                                         |   10 +-
 driver/runtests.py                                 |   54 +-
 driver/testglobals.py                              |   20 +-
 driver/testlib.py                                  |  646 +++++++++-----------
 mk/boilerplate.mk                                  |   16 +-
 mk/test.mk                                         |   10 +
 tests/Makefile                                     |    3 +-
 tests/annotations/should_compile/all.T             |    2 +-
 tests/annotations/should_fail/annfail01.stderr     |    4 +-
 tests/annotations/should_fail/annfail02.stderr     |    4 +-
 tests/annotations/should_fail/annfail03.stderr     |    5 +-
 tests/annotations/should_fail/annfail04.stderr     |    5 +-
 tests/annotations/should_fail/annfail06.hs         |    2 +-
 tests/annotations/should_fail/annfail06.stderr     |    5 +-
 tests/annotations/should_fail/annfail07.stderr     |    4 +-
 tests/annotations/should_fail/annfail08.stderr     |    2 +-
 tests/annotations/should_fail/annfail09.stderr     |    4 +-
 tests/annotations/should_fail/annfail10.stderr     |   18 +-
 tests/annotations/should_fail/annfail11.stderr     |    4 +-
 tests/annotations/should_run/all.T                 |    6 +-
 tests/array/should_run/all.T                       |   34 +-
 tests/arrows/should_compile/all.T                  |    2 +-
 tests/arrows/should_fail/T5380.stderr              |   12 +-
 tests/arrows/should_fail/all.T                     |    2 +-
 tests/arrows/should_fail/arrowfail001.stderr       |    4 +-
 tests/arrows/should_fail/arrowfail002.stderr       |    2 +-
 tests/arrows/should_fail/arrowfail004.stderr       |    2 +-
 tests/arrows/should_run/all.T                      |    4 +-
 tests/cabal/1750.stderr                            |    5 -
 tests/cabal/1750.stdout                            |    4 -
 tests/cabal/1750A.pkg                              |    4 -
 tests/cabal/1750B.pkg                              |    4 -
 tests/cabal/Makefile                               |   22 +-
 tests/cabal/T1750.stderr                           |    5 +
 tests/cabal/T1750.stdout                           |    4 +
 tests/cabal/T1750A.pkg                             |    4 +
 tests/cabal/T1750B.pkg                             |    4 +
 tests/cabal/all.T                                  |   16 +-
 tests/cabal/cabal01/all.T                          |    5 +-
 tests/codeGen/should_compile/Makefile              |    4 +-
 tests/codeGen/should_compile/{1916.hs => T1916.hs} |    0 
 tests/codeGen/should_compile/{2388.hs => T2388.hs} |    0 
 tests/codeGen/should_compile/{2578.hs => T2578.hs} |    0 
 tests/codeGen/should_compile/{3132.hs => T3132.hs} |    0 
 tests/codeGen/should_compile/{3579.hs => T3579.hs} |    0 
 tests/codeGen/should_compile/all.T                 |   14 +-
 tests/codeGen/should_gen_asm/all.T                 |    6 +-
 tests/codeGen/should_run/5626.stderr               |    1 -
 tests/codeGen/should_run/{1852.hs => T1852.hs}     |    0 
 .../should_run/{1852.stdout => T1852.stdout}       |    0 
 tests/codeGen/should_run/{1861.hs => T1861.hs}     |    0 
 .../should_run/{1861.stdout => T1861.stdout}       |    0 
 tests/codeGen/should_run/{2080.hs => T2080.hs}     |    0 
 .../should_run/{2080.stdout => T2080.stdout}       |    0 
 tests/codeGen/should_run/{2838.hs => T2838.hs}     |    0 
 .../should_run/{2838.stdout => T2838.stdout}       |    0 
 .../{2838.stdout-ws-64 => T2838.stdout-ws-64}      |    0 
 tests/codeGen/should_run/{3207.hs => T3207.hs}     |    0 
 .../should_run/{3207.stdout => T3207.stdout}       |    0 
 tests/codeGen/should_run/{3561.hs => T3561.hs}     |    0 
 .../should_run/{3561.stdout => T3561.stdout}       |    0 
 tests/codeGen/should_run/{3677.hs => T3677.hs}     |    0 
 .../should_run/{3677.stdout => T3677.stdout}       |    0 
 tests/codeGen/should_run/{4441.hs => T4441.hs}     |    0 
 .../should_run/{4441.stdout => T4441.stdout}       |    0 
 tests/codeGen/should_run/{5129.hs => T5129.hs}     |    0 
 tests/codeGen/should_run/{5149.hs => T5149.hs}     |    0 
 .../should_run/{5149.stdout => T5149.stdout}       |    0 
 .../should_run/{5149_cmm.cmm => T5149_cmm.cmm}     |    0 
 tests/codeGen/should_run/{5626.hs => T5626.hs}     |    0 
 tests/codeGen/should_run/T5626.stderr              |    1 +
 tests/codeGen/should_run/{5747.hs => T5747.hs}     |    0 
 .../should_run/{5747.stdout => T5747.stdout}       |    0 
 tests/codeGen/should_run/{5785.hs => T5785.hs}     |    0 
 .../should_run/{5785.stdout => T5785.stdout}       |    0 
 tests/codeGen/should_run/{6146.hs => T6146.hs}     |    0 
 .../codeGen/should_run/{6146.stdin => T6146.stdin} |    0 
 .../should_run/{6146.stdout => T6146.stdout}       |    0 
 tests/codeGen/should_run/T7600.hs                  |  111 ++++
 tests/codeGen/should_run/T7600.stdout              |    2 +
 tests/codeGen/should_run/T7600_A.hs                |   83 +++
 tests/codeGen/should_run/all.T                     |   44 +-
 tests/codeGen/should_run/cgrun055.hs               |    2 +-
 tests/codeGen/should_run/cgrun064.hs               |    2 +-
 tests/codeGen/should_run/cgrun068.hs               |    2 +-
 tests/codeGen/should_run/cgrun070.hs               |    2 +-
 tests/concurrent/2317/all.T                        |    5 -
 tests/concurrent/{2317 => T2317}/Makefile          |    0 
 tests/concurrent/{2317/2317.hs => T2317/T2317.hs}  |    0 
 .../{2317/2317.stdout => T2317/T2317.stdout}       |    0 
 tests/concurrent/T2317/all.T                       |    5 +
 tests/concurrent/prog001/all.T                     |    2 +-
 tests/concurrent/prog002/all.T                     |    2 +-
 tests/concurrent/prog003/TestRun.hs                |    8 +-
 tests/concurrent/prog003/all.T                     |    2 +-
 tests/concurrent/should_run/2910.hs                |    9 -
 tests/concurrent/should_run/3279.hs                |   24 -
 tests/concurrent/should_run/4030.hs                |    8 -
 tests/concurrent/should_run/4030.stderr            |    1 -
 tests/concurrent/should_run/5611.stderr            |    1 -
 tests/concurrent/should_run/5866.stderr            |    1 -
 tests/concurrent/should_run/{1980.hs => T1980.hs}  |    0 
 tests/concurrent/should_run/T2910.hs               |    9 +
 .../should_run/{2910.stdout => T2910.stdout}       |    0 
 .../concurrent/should_run/{2910a.hs => T2910a.hs}  |    0 
 .../should_run/{2910a.stdout => T2910a.stdout}     |    0 
 tests/concurrent/should_run/T3279.hs               |   25 +
 .../should_run/{3279.stdout => T3279.stdout}       |    0 
 tests/concurrent/should_run/{3429.hs => T3429.hs}  |    0 
 .../should_run/{3429.stdout => T3429.stdout}       |    0 
 tests/concurrent/should_run/{367.hs => T367.hs}    |    0 
 .../should_run/{367.stdout => T367.stdout}         |    0 
 .../{367_letnoescape.hs => T367_letnoescape.hs}    |    0 
 ..._letnoescape.stdout => T367_letnoescape.stdout} |    0 
 tests/concurrent/should_run/T4030.hs               |    8 +
 tests/concurrent/should_run/T4030.stderr           |    1 +
 tests/concurrent/should_run/{4262.hs => T4262.hs}  |    0 
 .../should_run/{4262.stdout => T4262.stdout}       |    0 
 tests/concurrent/should_run/{4811.hs => T4811.hs}  |    0 
 tests/concurrent/should_run/{4813.hs => T4813.hs}  |    0 
 tests/concurrent/should_run/{5238.hs => T5238.hs}  |    0 
 .../should_run/{5238.stdout => T5238.stdout}       |    0 
 tests/concurrent/should_run/{5421.hs => T5421.hs}  |    0 
 tests/concurrent/should_run/{5558.hs => T5558.hs}  |    0 
 tests/concurrent/should_run/{5611.hs => T5611.hs}  |    0 
 tests/concurrent/should_run/T5611.stderr           |    1 +
 .../should_run/{5611.stdout => T5611.stdout}       |    0 
 tests/concurrent/should_run/{5866.hs => T5866.hs}  |    0 
 tests/concurrent/should_run/T5866.stderr           |    1 +
 tests/concurrent/should_run/all.T                  |   81 ++--
 tests/concurrent/should_run/conc039.hs             |    1 +
 tests/concurrent/should_run/conc040.hs             |    1 +
 tests/concurrent/should_run/conc069.hs             |    6 +-
 tests/concurrent/should_run/conc069.stdout         |    8 +-
 tests/concurrent/should_run/mask002.hs             |    8 +-
 tests/concurrent/should_run/throwto002.hs          |    8 +-
 tests/concurrent/should_run/throwto003.hs          |    6 +-
 tests/cpranal/should_compile/all.T                 |    2 +-
 tests/deSugar/should_compile/GadtOverlap.stderr    |    6 +-
 tests/deSugar/should_compile/T2395.stderr          |    6 +-
 tests/deSugar/should_compile/T2431.stderr          |    2 +-
 tests/deSugar/should_compile/T5117.stderr          |    6 +-
 tests/deSugar/should_compile/T7669.hs              |   11 +
 tests/deSugar/should_compile/all.T                 |    6 +-
 tests/deSugar/should_compile/ds002.stderr-ghc      |   16 +-
 tests/deSugar/should_compile/ds003.stderr-ghc      |   10 +-
 tests/deSugar/should_compile/ds019.stderr-ghc      |   12 +-
 tests/deSugar/should_compile/ds020.stderr-ghc      |   28 +-
 tests/deSugar/should_compile/ds022.stderr-ghc      |   10 +-
 tests/deSugar/should_compile/ds041.stderr-ghc      |   10 +-
 tests/deSugar/should_compile/ds051.stderr-ghc      |   18 +-
 tests/deSugar/should_compile/ds053.stderr-ghc      |    2 +-
 tests/deSugar/should_compile/ds056.stderr          |    6 +-
 tests/deSugar/should_compile/ds061.hs              |   14 -
 tests/deSugar/should_run/all.T                     |    8 +-
 tests/deriving/should_compile/Makefile             |    6 +
 tests/deriving/should_compile/T1133.hs             |    8 +
 tests/deriving/should_compile/T1133.hs-boot        |    4 +
 tests/deriving/should_compile/T2378.hs             |    2 +-
 tests/deriving/should_compile/T3965.hs             |   11 +-
 tests/deriving/should_compile/T4302.hs             |    2 +-
 tests/deriving/should_compile/T7710.hs             |   21 +
 tests/deriving/should_compile/all.T                |    6 +
 tests/deriving/should_compile/drv021.hs            |    2 +-
 tests/deriving/should_compile/drv021.stderr        |   13 +
 tests/deriving/should_compile/drv022.hs            |   10 +
 tests/deriving/should_fail/Makefile                |    5 +
 tests/deriving/should_fail/T1133A.hs               |    6 +
 tests/deriving/should_fail/T1133A.hs-boot          |    4 +
 tests/deriving/should_fail/T1133A.stderr           |    7 +
 tests/deriving/should_fail/T2394.stderr            |    4 +-
 tests/deriving/should_fail/T2604.stderr            |    8 +-
 tests/deriving/should_fail/T2701.stderr            |    6 +-
 tests/deriving/should_fail/T2721.stderr            |    4 +-
 tests/deriving/should_fail/T3101.stderr            |    6 +-
 tests/deriving/should_fail/T3833.stderr            |    6 +-
 tests/deriving/should_fail/T3834.stderr            |    6 +-
 tests/deriving/should_fail/T4528.stderr            |   14 +-
 tests/deriving/should_fail/T5287.stderr            |    4 +-
 tests/deriving/should_fail/T5478.stderr            |    6 +-
 tests/deriving/should_fail/T5686.stderr            |    6 +-
 tests/deriving/should_fail/T5922.stderr            |    4 +-
 tests/deriving/should_fail/all.T                   |    6 +-
 .../drvfail-foldable-traversable1.stderr           |   12 +-
 tests/deriving/should_fail/drvfail-functor1.stderr |    4 +-
 tests/deriving/should_fail/drvfail-functor2.stderr |   24 +-
 tests/deriving/should_fail/drvfail005.stderr       |    6 +-
 tests/deriving/should_fail/drvfail009.stderr       |   20 +-
 tests/deriving/should_fail/drvfail010.hs           |   10 -
 tests/deriving/should_fail/drvfail010.stderr       |   11 -
 tests/deriving/should_fail/drvfail010.stderr-hugs  |    1 -
 tests/deriving/should_fail/drvfail011.stderr       |   10 +-
 tests/deriving/should_fail/drvfail014.hs           |    2 +-
 tests/deriving/should_fail/drvfail014.stderr       |    4 +-
 tests/deriving/should_fail/drvfail015.stderr       |   10 +-
 tests/deriving/should_run/all.T                    |   34 +-
 tests/dph/classes/dph-classes.T                    |    3 +-
 tests/dph/diophantine/dph-diophantine.T            |    2 +-
 tests/dph/dotp/dph-dotp.T                          |    4 +-
 tests/dph/modules/ExportList.hs                    |   33 +
 .../should_compile => dph/modules}/Makefile        |    0 
 tests/dph/modules/dph-ExportList-vseg-fast.stderr  |    6 +
 tests/dph/modules/dph-modules.T                    |    8 +
 tests/dph/nbody/dph-nbody.T                        |    8 +-
 tests/dph/primespj/dph-primespj.T                  |    2 +-
 tests/dph/quickhull/dph-quickhull.T                |    8 +-
 tests/dph/smvm/dph-smvm.T                          |    4 +-
 tests/dph/words/WordsVect.hs                       |    2 +
 tests/dph/words/dph-words.T                        |    4 +-
 tests/driver/1372/1372.stderr                      |    2 -
 tests/driver/1372/Makefile                         |   41 --
 tests/driver/1372/all.T                            |    5 -
 tests/driver/1959/test.T                           |    5 -
 tests/driver/2464.stderr                           |    3 -
 tests/driver/2499.stderr                           |    4 -
 tests/driver/3674.hs                               |    5 -
 tests/driver/437/Makefile                          |   27 -
 tests/driver/437/all.T                             |    7 -
 tests/driver/Makefile                              |   21 +-
 tests/driver/T1372/Makefile                        |   41 ++
 tests/driver/T1372/T1372.stderr                    |    2 +
 tests/driver/T1372/all.T                           |    5 +
 tests/driver/{1372 => T1372}/p1/A1.hs              |    0 
 tests/driver/{1372 => T1372}/p1/A2.hs              |    0 
 tests/driver/{1372 => T1372}/p1/Setup.hs           |    0 
 tests/driver/{1372 => T1372}/p1/p1.cabal           |    0 
 tests/driver/{1372 => T1372}/p2/Main.hs            |    0 
 tests/driver/{1372 => T1372}/p2/Setup.hs           |    0 
 tests/driver/{1372 => T1372}/p2/p2.cabal           |    0 
 tests/driver/{1959 => T1959}/B.hs                  |    0 
 tests/driver/{1959 => T1959}/C.hs                  |    0 
 tests/driver/{1959 => T1959}/D.hs                  |    0 
 tests/driver/{1959 => T1959}/E1.hs                 |    0 
 tests/driver/{1959 => T1959}/E2.hs                 |    0 
 tests/driver/{1959 => T1959}/Makefile              |    0 
 .../{1959/1959.stdout => T1959/T1959.stdout}       |    0 
 tests/driver/T1959/test.T                          |    5 +
 tests/driver/{2464.hs => T2464.hs}                 |    0 
 tests/driver/T2464.stderr                          |    3 +
 tests/driver/{2499.hs => T2499.hs}                 |    0 
 tests/driver/T2499.stderr                          |    4 +
 tests/driver/T2507.hs                              |    5 +
 tests/driver/T2507.stderr                          |    5 +
 tests/driver/{2566.stderr => T2566.stderr}         |    0 
 tests/driver/T3674.hs                              |    5 +
 tests/driver/{3674_pre.hs => T3674_pre.hs}         |    0 
 tests/driver/T437/Makefile                         |   27 +
 tests/driver/{437/437.stderr => T437/T437.stderr}  |    0 
 tests/driver/{437/437.stdout => T437/T437.stdout}  |    0 
 tests/driver/{437 => T437}/Test.hs                 |    0 
 tests/driver/{437 => T437}/Test2.hs                |    0 
 tests/driver/T437/all.T                            |    7 +
 tests/driver/T4437.hs                              |    4 +-
 tests/driver/T5147/T5147.stderr                    |    4 +-
 tests/driver/{5313.hs => T5313.hs}                 |    0 
 tests/driver/T6037.hs                              |    5 +
 tests/driver/T6037.stderr                          |    5 +
 tests/driver/all.T                                 |   21 +-
 tests/driver/bug1677/bug1677.stderr                |    4 +-
 tests/driver/driver063.stderr                      |    2 +-
 tests/driver/dynamicToo/all.T                      |    5 +-
 tests/driver/dynamic_flags_001/all.T               |    2 +-
 tests/driver/dynamic_flags_002/all.T               |   16 +-
 tests/driver/recomp001/all.T                       |    2 +-
 tests/driver/recomp001/recomp001.stderr            |    2 +-
 tests/driver/recomp002/all.T                       |    2 +-
 tests/driver/recomp005/all.T                       |    2 +-
 tests/driver/recomp005/recomp005.stderr            |    4 +-
 tests/driver/recomp006/all.T                       |    3 +-
 tests/driver/recomp007/all.T                       |    2 +-
 tests/driver/recomp008/all.T                       |    2 +-
 tests/driver/werror.stderr                         |   32 +-
 tests/dynlibs/all.T                                |    4 +-
 tests/esc/all.T                                    |    2 +-
 tests/ffi/should_compile/1357.stderr               |    3 -
 tests/ffi/should_compile/{1357.hs => T1357.hs}     |    0 
 tests/ffi/should_compile/T1357.stderr              |    3 +
 tests/ffi/should_compile/{3624.hs => T3624.hs}     |    0 
 tests/ffi/should_compile/{3742.hs => T3742.hs}     |    0 
 tests/ffi/should_compile/all.T                     |    8 +-
 tests/ffi/should_fail/all.T                        |    6 +-
 tests/ffi/should_run/2594_c.c                      |    7 -
 tests/ffi/should_run/5402_main.c                   |   13 -
 tests/ffi/should_run/5594_c.c                      |   12 -
 tests/ffi/should_run/7170.stderr                   |    1 -
 tests/ffi/should_run/Makefile                      |   16 +-
 tests/ffi/should_run/{1288.hs => T1288.hs}         |    0 
 tests/ffi/should_run/{1288.stdout => T1288.stdout} |    0 
 tests/ffi/should_run/{1288_c.c => T1288_c.c}       |    0 
 .../ffi/should_run/{1288_ghci.hs => T1288_ghci.hs} |    0 
 .../{1288_ghci.stdout => T1288_ghci.stdout}        |    0 
 .../should_run/{1288_ghci_c.c => T1288_ghci_c.c}   |    0 
 tests/ffi/should_run/{1679.hs => T1679.hs}         |    0 
 tests/ffi/should_run/{1679.stdout => T1679.stdout} |    0 
 tests/ffi/should_run/{2276.hs => T2276.hs}         |    0 
 tests/ffi/should_run/{2276.stdout => T2276.stdout} |    0 
 tests/ffi/should_run/{2276_c.c => T2276_c.c}       |    0 
 .../ffi/should_run/{2276_ghci.hs => T2276_ghci.hs} |    0 
 .../{2276_ghci.stdout => T2276_ghci.stdout}        |    0 
 .../should_run/{2276_ghci_c.c => T2276_ghci_c.c}   |    0 
 tests/ffi/should_run/{2469.hs => T2469.hs}         |    0 
 tests/ffi/should_run/{2594.hs => T2594.hs}         |    0 
 tests/ffi/should_run/{2594.stdout => T2594.stdout} |    0 
 tests/ffi/should_run/T2594_c.c                     |    7 +
 tests/ffi/should_run/{2594_c.h => T2594_c.h}       |    0 
 tests/ffi/should_run/{2917a.hs => T2917a.hs}       |    0 
 tests/ffi/should_run/{4038.hs => T4038.hs}         |    0 
 tests/ffi/should_run/{4038.stdout => T4038.stdout} |    0 
 tests/ffi/should_run/{4221.hs => T4221.hs}         |    0 
 tests/ffi/should_run/{4221.stdout => T4221.stdout} |    0 
 tests/ffi/should_run/{4221_c.c => T4221_c.c}       |    0 
 tests/ffi/should_run/{5402.hs => T5402.hs}         |    0 
 tests/ffi/should_run/T5402_main.c                  |   13 +
 tests/ffi/should_run/{5594.hs => T5594.hs}         |    0 
 tests/ffi/should_run/{5594.stdout => T5594.stdout} |    0 
 tests/ffi/should_run/T5594_c.c                     |   12 +
 tests/ffi/should_run/{7170.hs => T7170.hs}         |    0 
 tests/ffi/should_run/T7170.stderr                  |    1 +
 tests/ffi/should_run/{7170.stdout => T7170.stdout} |    0 
 tests/ffi/should_run/all.T                         |  123 ++--
 tests/gadt/T3163.stderr                            |    4 +-
 tests/gadt/T3169.stderr                            |    4 +-
 tests/gadt/T3651.stderr                            |   26 +-
 tests/gadt/T7293.stderr                            |    6 +-
 tests/gadt/T7294.stderr                            |    6 +-
 tests/gadt/all.T                                   |   20 +-
 tests/gadt/gadt-escape1.hs                         |    2 +-
 tests/gadt/gadt-escape1.stderr                     |    6 +-
 tests/gadt/gadt10.stderr                           |   10 +-
 tests/gadt/gadt11.stderr                           |    8 +-
 tests/gadt/gadt13.stderr                           |   12 +-
 tests/gadt/gadt21.stderr                           |   15 +-
 tests/gadt/gadt7.stderr                            |    8 +-
 tests/gadt/gadtSyntaxFail001.stderr                |    6 +-
 tests/gadt/gadtSyntaxFail002.stderr                |    6 +-
 tests/gadt/gadtSyntaxFail003.stderr                |    6 +-
 tests/gadt/lazypat.stderr                          |    2 +-
 tests/gadt/records-fail1.stderr                    |    4 +-
 tests/gadt/rw.stderr                               |   14 +-
 tests/generics/GenCannotDoRep0.stderr              |   16 +-
 tests/generics/GenCannotDoRep1.stderr              |    4 +-
 tests/generics/GenCannotDoRep1_0.stderr            |    4 +-
 tests/generics/GenCannotDoRep1_1.stderr            |    4 +-
 tests/generics/GenCannotDoRep1_2.stderr            |    4 +-
 tests/generics/GenCannotDoRep1_3.stderr            |    6 +-
 tests/generics/GenCannotDoRep1_4.stderr            |    6 +-
 tests/generics/GenCannotDoRep1_5.stderr            |    6 +-
 tests/generics/GenCannotDoRep1_6.stderr            |    6 +-
 tests/generics/GenCannotDoRep1_7.stderr            |    4 +-
 tests/generics/GenCannotDoRep1_8.stderr            |    6 +-
 tests/generics/GenCannotDoRep2.stderr              |    4 +-
 tests/generics/GenNewtype.hs                       |   10 +
 tests/generics/GenNewtype.stdout                   |    1 +
 tests/generics/GenShouldFail0.stderr               |    4 +-
 tests/generics/GenShouldFail1_0.stderr             |    4 +-
 tests/generics/all.T                               |    1 +
 tests/ghc-api/T4891/T4891.hs                       |    2 +-
 tests/ghc-api/T4891/all.T                          |    2 +-
 tests/ghc-api/T6145.hs                             |    2 +-
 tests/ghc-api/all.T                                |    2 +-
 tests/ghc-api/apirecomp001/all.T                   |    5 +-
 tests/ghc-api/apirecomp001/apirecomp001.stderr     |   20 +-
 tests/ghc-api/dynCompileExpr/all.T                 |    1 +
 tests/ghc-e/should_run/2636.stderr                 |    4 -
 tests/ghc-e/should_run/Makefile                    |   15 +-
 tests/ghc-e/should_run/{2228.hs => T2228.hs}       |    0 
 .../ghc-e/should_run/{2228.stdout => T2228.stdout} |    0 
 tests/ghc-e/should_run/{2636.hs => T2636.hs}       |    0 
 tests/ghc-e/should_run/T2636.stderr                |    4 +
 tests/ghc-e/should_run/{3890.hs => T3890.hs}       |    0 
 .../ghc-e/should_run/{3890.stdout => T3890.stdout} |    0 
 tests/ghc-e/should_run/all.T                       |   13 +-
 tests/ghci.debugger/HappyTest.hs                   |    2 +-
 tests/ghci.debugger/scripts/2740.script            |    8 -
 tests/ghci.debugger/scripts/2740.stdout            |   10 -
 tests/ghci.debugger/scripts/{2740.hs => T2740.hs}  |    0 
 tests/ghci.debugger/scripts/T2740.script           |    8 +
 tests/ghci.debugger/scripts/T2740.stdout           |   10 +
 tests/ghci.debugger/scripts/all.T                  |   15 +-
 tests/ghci.debugger/scripts/break003.stderr        |    2 +-
 tests/ghci.debugger/scripts/break003.stdout        |    4 +-
 tests/ghci.debugger/scripts/break005.stdout        |    2 +-
 tests/ghci.debugger/scripts/break006.stderr        |   24 +-
 tests/ghci.debugger/scripts/break006.stdout        |   12 +-
 tests/ghci.debugger/scripts/break019.stderr        |    2 +-
 tests/ghci.debugger/scripts/break022/all.T         |    2 +-
 tests/ghci.debugger/scripts/break023/all.T         |    2 +-
 tests/ghci.debugger/scripts/break027.stdout        |    2 +-
 tests/ghci.debugger/scripts/dynbrk001.stderr       |    2 +-
 tests/ghci.debugger/scripts/dynbrk001.stdout       |    2 +-
 tests/ghci.debugger/scripts/hist001.stdout         |   18 +-
 tests/ghci.debugger/scripts/print019.stderr        |    4 +-
 tests/ghci.debugger/scripts/print020.stderr        |   31 +
 tests/ghci.debugger/scripts/print020.stdout        |    4 +-
 tests/ghci.debugger/scripts/result001.stdout       |    4 +
 tests/ghci/linking/all.T                           |   20 +-
 tests/ghci/prog004/prog004.T                       |    2 +-
 tests/ghci/prog006/prog006.stderr                  |    2 +-
 tests/ghci/prog009/ghci.prog009.stderr             |    4 +-
 tests/ghci/prog012/prog012.stderr                  |    2 +-
 tests/ghci/scripts/2452.stderr                     |    2 -
 tests/ghci/scripts/2816.stderr                     |    2 -
 tests/ghci/scripts/4051.script                     |    4 -
 tests/ghci/scripts/Defer02.stderr                  |  214 ++++----
 tests/ghci/scripts/Makefile                        |    5 +
 tests/ghci/scripts/{1914.script => T1914.script}   |    0 
 tests/ghci/scripts/{1914.stderr => T1914.stderr}   |    0 
 tests/ghci/scripts/{1914.stdout => T1914.stdout}   |    0 
 tests/ghci/scripts/{2452.script => T2452.script}   |    0 
 tests/ghci/scripts/T2452.stderr                    |    2 +
 tests/ghci/scripts/{2816.script => T2816.script}   |    0 
 tests/ghci/scripts/T2816.stderr                    |    2 +
 tests/ghci/scripts/{2816.stdout => T2816.stdout}   |    0 
 tests/ghci/scripts/{2976.script => T2976.script}   |    0 
 tests/ghci/scripts/{2976.stdout => T2976.stdout}   |    0 
 tests/ghci/scripts/{4051.hs => T4051.hs}           |    0 
 tests/ghci/scripts/T4051.script                    |    4 +
 tests/ghci/scripts/{4051.stdout => T4051.stdout}   |    0 
 tests/ghci/scripts/T4127a.stderr                   |    2 +-
 tests/ghci/scripts/T5545.stdout                    |    2 +-
 tests/ghci/scripts/T5564.stderr                    |    8 +-
 tests/ghci/scripts/T5836.stderr                    |    2 +-
 tests/ghci/scripts/T5979.stderr                    |    2 +-
 tests/ghci/scripts/T6007.stderr                    |    4 +-
 tests/ghci/scripts/T6106.script                    |    2 +-
 tests/ghci/scripts/T6106_preproc.hs                |   17 +
 tests/ghci/scripts/T6106_preproc.sh                |    7 -
 tests/ghci/scripts/T7587.script                    |    3 +
 tests/ghci/scripts/T7587.stdout                    |    1 +
 tests/ghci/scripts/T7627.script                    |   16 +
 tests/ghci/scripts/T7627.stdout                    |   25 +
 tests/ghci/scripts/T7627b.script                   |    8 +
 tests/ghci/scripts/T7627b.stderr                   |   12 +
 tests/ghci/scripts/T7688.hs                        |    5 +
 tests/ghci/scripts/T7688.script                    |    4 +
 tests/ghci/scripts/T7688.stdout                    |    1 +
 tests/ghci/scripts/all.T                           |   33 +-
 tests/ghci/scripts/ghci008.stdout                  |   16 +-
 tests/ghci/scripts/ghci011.stdout                  |   42 +-
 tests/ghci/scripts/ghci020.stdout                  |    6 +-
 tests/ghci/scripts/ghci021.stderr                  |    2 +-
 tests/ghci/scripts/ghci034.stderr                  |    2 +-
 tests/ghci/scripts/ghci036.stderr                  |   16 +-
 tests/ghci/scripts/ghci038.stderr                  |    4 +-
 tests/ghci/scripts/ghci044.stderr                  |    4 +-
 tests/ghci/scripts/ghci047.stderr                  |    8 +-
 tests/ghci/scripts/ghci048.stderr                  |    4 +-
 tests/ghci/scripts/ghci050.stderr                  |    8 +-
 tests/ghci/scripts/ghci051.stderr                  |    4 +-
 tests/ghci/scripts/ghci052.stderr                  |   30 +-
 tests/ghci/scripts/ghci053.stderr                  |   16 +-
 tests/ghci/scripts/ghci057.stderr                  |   16 +-
 tests/ghci/shell.hs                                |    2 +-
 tests/ghci/should_run/Makefile                     |    2 +-
 tests/ghci/should_run/{2589.hs => T2589.hs}        |    0 
 .../ghci/should_run/{2589.stdout => T2589.stdout}  |    0 
 tests/ghci/should_run/{2881.hs => T2881.hs}        |    0 
 .../ghci/should_run/{2881.stdout => T2881.stdout}  |    0 
 .../ghci/should_run/{3171.stdout => T3171.stdout}  |    0 
 tests/ghci/should_run/all.T                        |   14 +-
 tests/haddock/haddock_examples/haddock.Test.stderr |    8 +-
 .../haddockSimplUtilsBug.hs                        |    2 +-
 tests/hsc2hs/Makefile                              |    4 +-
 tests/hsc2hs/{3837.hsc => T3837.hsc}               |    0 
 tests/hsc2hs/all.T                                 |    6 +-
 tests/indexed-types/should_compile/Class3.stderr   |    6 +-
 tests/indexed-types/should_compile/Gentle.hs       |    4 +-
 tests/indexed-types/should_compile/Simple14.stderr |   10 +-
 tests/indexed-types/should_compile/Simple2.stderr  |   60 +-
 tests/indexed-types/should_compile/T1769.hs        |    2 +-
 tests/indexed-types/should_compile/T3017.stderr    |    4 +-
 tests/indexed-types/should_compile/T3208b.stderr   |   12 +-
 tests/indexed-types/should_compile/T7282.hs        |    9 +
 tests/indexed-types/should_compile/T7585.hs        |   21 +
 tests/indexed-types/should_compile/all.T           |    5 +-
 .../indexed-types/should_fail/DerivUnsatFam.stderr |    4 +-
 .../indexed-types/should_fail/ExtraTcsUntch.stderr |    2 +-
 tests/indexed-types/should_fail/GADTwrong1.stderr  |    4 +-
 tests/indexed-types/should_fail/NoMatchErr.stderr  |    6 +-
 .../should_fail/NotRelaxedExamples.stderr          |    6 +-
 tests/indexed-types/should_fail/Overlap10.stderr   |    4 +-
 tests/indexed-types/should_fail/Overlap11.stderr   |    4 +-
 tests/indexed-types/should_fail/Overlap5.stderr    |   12 +-
 tests/indexed-types/should_fail/Overlap6.stderr    |    6 +-
 tests/indexed-types/should_fail/Overlap9.stderr    |    4 +-
 .../indexed-types/should_fail/SimpleFail12.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail13.stderr  |    4 +-
 .../indexed-types/should_fail/SimpleFail14.stderr  |    8 +-
 .../indexed-types/should_fail/SimpleFail15.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail16.stderr  |    8 +-
 .../indexed-types/should_fail/SimpleFail1a.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail1b.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail2a.stderr  |    7 +-
 .../indexed-types/should_fail/SimpleFail3a.stderr  |    4 +-
 tests/indexed-types/should_fail/SimpleFail4.stderr |    6 +-
 .../indexed-types/should_fail/SimpleFail5a.stderr  |    6 +-
 .../indexed-types/should_fail/SimpleFail5b.stderr  |    4 +-
 tests/indexed-types/should_fail/SimpleFail6.stderr |    2 +-
 tests/indexed-types/should_fail/SimpleFail7.stderr |    4 +-
 tests/indexed-types/should_fail/SimpleFail8.stderr |    4 +-
 tests/indexed-types/should_fail/SimpleFail9.hs     |    4 +-
 tests/indexed-types/should_fail/SimpleFail9.stderr |    7 -
 tests/indexed-types/should_fail/T1897b.stderr      |   10 +-
 tests/indexed-types/should_fail/T1900.stderr       |    6 +-
 tests/indexed-types/should_fail/T2157.stderr       |    4 +-
 tests/indexed-types/should_fail/T2203a.stderr      |    4 +-
 tests/indexed-types/should_fail/T2239.stderr       |   12 +-
 tests/indexed-types/should_fail/T2334.stderr       |   17 -
 .../should_fail/{T2334.hs => T2334A.hs}            |    0 
 tests/indexed-types/should_fail/T2334A.stderr      |   17 +
 tests/indexed-types/should_fail/T2544.stderr       |   16 +-
 tests/indexed-types/should_fail/T2627b.stderr      |    4 +-
 tests/indexed-types/should_fail/T2664.stderr       |    8 +-
 tests/indexed-types/should_fail/T2693.stderr       |   32 +-
 tests/indexed-types/should_fail/T3092.stderr       |    8 +-
 tests/indexed-types/should_fail/T3330a.stderr      |   26 +-
 tests/indexed-types/should_fail/T3330c.stderr      |    6 +-
 tests/indexed-types/should_fail/T3440.stderr       |   10 +-
 tests/indexed-types/should_fail/T4093a.stderr      |    6 +-
 tests/indexed-types/should_fail/T4093b.stderr      |    6 +-
 tests/indexed-types/should_fail/T4099.stderr       |   18 +-
 tests/indexed-types/should_fail/T4174.stderr       |    4 +-
 tests/indexed-types/should_fail/T4179.stderr       |    6 +-
 tests/indexed-types/should_fail/T4272.stderr       |   10 +-
 tests/indexed-types/should_fail/T4485.stderr       |   14 +-
 tests/indexed-types/should_fail/T5439.stderr       |   20 +-
 tests/indexed-types/should_fail/T5515.stderr       |    4 +-
 tests/indexed-types/should_fail/T5934.stderr       |    4 +-
 tests/indexed-types/should_fail/T6123.stderr       |    4 +-
 tests/indexed-types/should_fail/T7010.stderr       |    6 +-
 tests/indexed-types/should_fail/T7194.stderr       |    8 +-
 tests/indexed-types/should_fail/T7354.stderr       |    4 +-
 tests/indexed-types/should_fail/T7354a.stderr      |    6 +-
 tests/indexed-types/should_fail/T7536.stderr       |    4 +-
 tests/indexed-types/should_fail/T7729.hs           |   28 +
 tests/indexed-types/should_fail/T7729.stderr       |   17 +
 tests/indexed-types/should_fail/T7729a.hs          |   28 +
 tests/indexed-types/should_fail/T7729a.stderr      |    8 +
 tests/indexed-types/should_fail/TyFamArity1.stderr |    2 +-
 tests/indexed-types/should_fail/TyFamArity2.stderr |    2 +-
 tests/indexed-types/should_fail/TyFamUndec.stderr  |    8 +-
 tests/indexed-types/should_fail/all.T              |   11 +-
 tests/layout/all.T                                 |    2 +-
 tests/llvm/should_compile/{5054.hs => T5054.hs}    |    0 
 .../llvm/should_compile/{5054_2.hs => T5054_2.hs}  |    0 
 tests/llvm/should_compile/{5486.hs => T5486.hs}    |    0 
 tests/llvm/should_compile/{5681.hs => T5681.hs}    |    0 
 tests/llvm/should_compile/{6158.hs => T6158.hs}    |    0 
 tests/llvm/should_compile/T7571.cmm                |   11 +
 tests/llvm/should_compile/T7575.hs                 |   16 +
 tests/llvm/should_compile/all.T                    |   15 +-
 tests/mdo/should_fail/mdofail001.stderr            |    4 +-
 tests/mdo/should_fail/mdofail002.stderr            |    2 +-
 tests/mdo/should_fail/mdofail003.stderr            |    2 +-
 tests/module/T414.stderr                           |    2 +-
 tests/module/all.T                                 |    2 +-
 tests/module/base01/all.T                          |    2 +-
 tests/module/mod1.stderr                           |    2 +-
 tests/module/mod10.stderr                          |    2 +-
 tests/module/mod101.stderr                         |    4 +-
 tests/module/mod102.stderr                         |    4 +-
 tests/module/mod110.stderr                         |   10 +-
 tests/module/mod114.stderr                         |    2 +-
 tests/module/mod116.stderr                         |    2 +-
 tests/module/mod120.stderr                         |    2 +-
 tests/module/mod121.stderr                         |    4 +-
 tests/module/mod122.stderr                         |    2 +-
 tests/module/mod123.stderr                         |    2 +-
 tests/module/mod124.stderr                         |    2 +-
 tests/module/mod125.stderr                         |    2 +-
 tests/module/mod126.stderr                         |    2 +-
 tests/module/mod127.stderr                         |    2 +-
 tests/module/mod128.stderr-ghc                     |    2 +-
 tests/module/mod130.stderr                         |    2 +-
 tests/module/mod131.stderr                         |   10 +-
 tests/module/mod132.stderr                         |    2 +-
 tests/module/mod134.stderr                         |    8 +-
 tests/module/mod136.stderr                         |    6 +-
 tests/module/mod138.stderr                         |    2 +-
 tests/module/mod14.stderr-ghc                      |    5 +-
 tests/module/mod142.stderr                         |    8 +-
 tests/module/mod143.stderr                         |    8 +-
 tests/module/mod144.stderr                         |    8 +-
 tests/module/mod145.stderr                         |    8 +-
 tests/module/mod146.stderr                         |    8 +-
 tests/module/mod147.stderr                         |    2 +-
 tests/module/mod150.stderr                         |   10 +-
 tests/module/mod151.stderr                         |   10 +-
 tests/module/mod152.stderr                         |   20 +-
 tests/module/mod153.stderr                         |   10 +-
 tests/module/mod155.stderr                         |   10 +-
 tests/module/mod158.stderr                         |    2 +-
 tests/module/mod160.stderr                         |    4 +-
 tests/module/mod161.stderr                         |    2 +-
 tests/module/mod164.stderr                         |   10 +-
 tests/module/mod165.stderr                         |    8 +-
 tests/module/mod17.stderr                          |    2 +-
 tests/module/mod174.stderr                         |    2 +-
 tests/module/mod176.stderr                         |    6 +-
 tests/module/mod177.stderr                         |    8 +-
 tests/module/mod178.stderr                         |    4 +-
 tests/module/mod18.stderr                          |    2 +-
 tests/module/mod180.stderr                         |    4 +-
 tests/module/mod19.stderr                          |    4 +-
 tests/module/mod2.stderr                           |    2 +-
 tests/module/mod20.stderr                          |    2 +-
 tests/module/mod21.stderr                          |    2 +-
 tests/module/mod22.stderr                          |    2 +-
 tests/module/mod23.stderr                          |    2 +-
 tests/module/mod24.stderr                          |    2 +-
 tests/module/mod25.stderr                          |    2 +-
 tests/module/mod26.stderr                          |    2 +-
 tests/module/mod29.stderr                          |    2 +-
 tests/module/mod3.stderr                           |    2 +-
 tests/module/mod36.stderr                          |    2 +-
 tests/module/mod38.stderr                          |    2 +-
 tests/module/mod4.stderr                           |    2 +-
 tests/module/mod40.stderr                          |    4 +-
 tests/module/mod41.stderr                          |    4 +-
 tests/module/mod42.stderr                          |    4 +-
 tests/module/mod43.stderr                          |   10 +-
 tests/module/mod45.stderr                          |    2 +-
 tests/module/mod46.stderr                          |    2 +-
 tests/module/mod47.stderr                          |    2 +-
 tests/module/mod49.stderr                          |    2 +-
 tests/module/mod5.stderr-ghc                       |    4 +-
 tests/module/mod50.stderr                          |    2 +-
 tests/module/mod53.stderr                          |    6 +-
 tests/module/mod55.stderr                          |    6 +-
 tests/module/mod56.stderr                          |    8 +-
 tests/module/mod59.stderr                          |    2 +-
 tests/module/mod60.stderr                          |    4 +-
 tests/module/mod61.stderr                          |    2 +-
 tests/module/mod62.stderr                          |    4 +-
 tests/module/mod63.stderr                          |    2 +-
 tests/module/mod66.stderr                          |    2 +-
 tests/module/mod67.stderr                          |    2 +-
 tests/module/mod68.stderr                          |    2 +-
 tests/module/mod7.stderr                           |    2 +-
 tests/module/mod72.stderr                          |    2 +-
 tests/module/mod73.stderr                          |    8 +-
 tests/module/mod74.stderr                          |    2 +-
 tests/module/mod77.stderr                          |    2 +-
 tests/module/mod79.stderr                          |    2 +-
 tests/module/mod80.stderr                          |    2 +-
 tests/module/mod81.stderr                          |    2 +-
 tests/module/mod87.stderr                          |    2 +-
 tests/module/mod88.stderr                          |    2 +-
 tests/module/mod89.stderr                          |    2 +-
 tests/module/mod9.stderr                           |    2 +-
 tests/module/mod90.stderr                          |    8 +-
 tests/module/mod91.stderr                          |    2 +-
 tests/module/mod97.stderr                          |    2 +-
 tests/numeric/should_run/{1603.hs => T1603.hs}     |    0 
 .../should_run/{1603.stdout => T1603.stdout}       |    0 
 tests/numeric/should_run/{3676.hs => T3676.hs}     |    0 
 .../should_run/{3676.stdout => T3676.stdout}       |    0 
 tests/numeric/should_run/{4381.hs => T4381.hs}     |    0 
 .../should_run/{4381.stdout => T4381.stdout}       |    0 
 tests/numeric/should_run/{4383.hs => T4383.hs}     |    0 
 .../should_run/{4383.stdout => T4383.stdout}       |    0 
 tests/numeric/should_run/T7689.hs                  |   78 +++
 tests/numeric/should_run/T7689.stdout              |   37 ++
 tests/numeric/should_run/all.T                     |   23 +-
 tests/{annotations => overloadedlists}/Makefile    |    0 
 .../should_fail}/Makefile                          |    0 
 tests/overloadedlists/should_fail/all.T            |    6 +
 .../should_fail/overloadedlistsfail01.hs           |    5 +
 .../should_fail/overloadedlistsfail01.stderr       |   36 ++
 .../should_fail/overloadedlistsfail02.hs           |    8 +
 .../should_fail/overloadedlistsfail02.stderr       |   13 +
 .../should_fail/overloadedlistsfail03.hs           |    3 +
 .../should_fail/overloadedlistsfail03.stderr       |    6 +
 .../should_fail/overloadedlistsfail04.hs           |    3 +
 .../should_fail/overloadedlistsfail04.stderr       |    8 +
 .../should_fail/overloadedlistsfail05.hs           |    3 +
 .../should_fail/overloadedlistsfail05.stderr       |    7 +
 .../should_fail/overloadedlistsfail06.hs           |    4 +
 .../should_fail/overloadedlistsfail06.stderr       |    4 +
 .../should_run}/Makefile                           |    0 
 tests/overloadedlists/should_run/all.T             |    5 +
 .../should_run/overloadedlistsrun01.hs             |    6 +
 .../should_run/overloadedlistsrun01.stdout         |    4 +
 .../should_run/overloadedlistsrun02.hs             |   13 +
 .../should_run/overloadedlistsrun02.stdout         |    3 +
 .../should_run/overloadedlistsrun03.hs             |   18 +
 .../should_run/overloadedlistsrun03.stdout         |    5 +
 .../should_run/overloadedlistsrun04.hs             |   28 +
 .../should_run/overloadedlistsrun04.stdout         |    7 +
 .../should_run/overloadedlistsrun05.hs             |   16 +
 .../should_run/overloadedlistsrun05.stdout         |    6 +
 tests/parser/should_compile/T2245.stderr           |   54 +-
 tests/parser/should_compile/T3303.stderr           |    2 +-
 tests/parser/should_compile/all.T                  |    6 +-
 tests/parser/should_compile/read014.stderr-ghc     |   40 +-
 tests/parser/should_fail/T3811d.stderr             |    4 +-
 tests/parser/should_fail/T984.hs                   |    9 +
 tests/parser/should_fail/T984.stderr               |    4 +
 tests/parser/should_fail/all.T                     |    7 +-
 tests/parser/should_fail/readFail001.stderr        |   20 +-
 tests/parser/should_fail/readFail007.stderr        |    4 +-
 tests/parser/should_fail/readFail008.stderr        |    6 +-
 tests/parser/should_fail/readFail016.stderr        |    2 +-
 tests/parser/should_fail/readFail021.stderr        |    3 +-
 tests/parser/should_fail/readFail023.stderr        |    4 +-
 tests/parser/should_fail/readFail025.stderr        |    4 +-
 tests/parser/should_fail/readFail035.stderr        |    4 +-
 tests/parser/should_fail/readFail036.stderr        |    4 +-
 tests/parser/should_fail/readFail037.stderr        |    4 +-
 tests/parser/should_fail/readFail039.stderr        |    6 +-
 tests/parser/should_fail/readFail041.stderr        |    4 +-
 tests/parser/should_fail/readFail042.stderr        |    4 +-
 tests/parser/should_fail/readFail043.stderr        |   14 +-
 tests/parser/should_fail/readFail046.stderr        |    2 +-
 tests/parser/should_run/all.T                      |    2 +-
 tests/parser/unicode/2302.stderr                   |    2 -
 tests/parser/unicode/{1103.hs => T1103.hs}         |    0 
 tests/parser/unicode/{1744.hs => T1744.hs}         |    0 
 tests/parser/unicode/{1744.stdout => T1744.stdout} |    0 
 tests/parser/unicode/{2302.hs => T2302.hs}         |    0 
 tests/parser/unicode/T2302.stderr                  |    2 +
 tests/parser/unicode/{4373.hs => T4373.hs}         |    0 
 tests/parser/unicode/T7671.hs                      |    8 +
 tests/parser/unicode/all.T                         |    9 +-
 tests/perf/compiler/all.T                          |  398 ++++++------
 tests/perf/compiler/parsing001.stderr              |    2 +-
 tests/perf/haddock/all.T                           |  199 ++++---
 tests/perf/should_run/T3245.hs                     |    7 +-
 tests/perf/should_run/{3586.hs => T3586.hs}        |    0 
 .../perf/should_run/{3586.stdout => T3586.stdout}  |    0 
 tests/perf/should_run/T4978.hs                     |    1 +
 tests/perf/should_run/T876.hs                      |   11 +
 .../5314.stdout => perf/should_run/T876.stdout}    |    0 
 tests/perf/should_run/all.T                        |  250 ++++----
 tests/perf/space_leaks/all.T                       |   32 +-
 tests/plugins/all.T                                |    4 +-
 tests/plugins/plugins03.stderr                     |    3 +-
 tests/plugins/plugins04.stderr                     |    2 +-
 tests/polykinds/PolyKinds02.stderr                 |    6 +-
 tests/polykinds/PolyKinds04.stderr                 |   12 +-
 tests/polykinds/PolyKinds06.stderr                 |    4 +-
 tests/polykinds/PolyKinds07.stderr                 |    8 +-
 tests/polykinds/T5716.stderr                       |    8 +-
 tests/polykinds/T5716a.stderr                      |    8 +-
 tests/polykinds/T6021.stderr                       |    2 +-
 tests/polykinds/T6039.stderr                       |    4 +-
 tests/polykinds/T6054.stderr                       |    6 +-
 tests/polykinds/T6068.hs                           |    4 +-
 tests/polykinds/T6068.stdout                       |    3 +-
 tests/polykinds/T6129.stderr                       |    8 +-
 tests/polykinds/T7053.stderr                       |   10 +-
 tests/polykinds/T7151.stderr                       |    2 +-
 tests/polykinds/T7224.stderr                       |    6 +-
 tests/polykinds/T7230.stderr                       |    6 +-
 tests/polykinds/T7278.stderr                       |    4 +-
 tests/polykinds/T7328.stderr                       |    8 +-
 tests/polykinds/T7341.stderr                       |    8 +-
 tests/polykinds/T7404.stderr                       |    4 +-
 tests/polykinds/T7433.stderr                       |    6 +-
 tests/polykinds/T7438.stderr                       |   12 +-
 tests/polykinds/T7488.hs                           |    2 +-
 tests/polykinds/T7524.hs                           |    6 +
 tests/polykinds/T7524.stderr                       |    5 +
 tests/polykinds/T7594.hs                           |   27 +
 tests/polykinds/T7594.stderr                       |   16 +
 tests/polykinds/T7601.hs                           |   12 +
 tests/polykinds/all.T                              |    3 +
 .../profiling/should_compile/{2410.hs => T2410.hs} |    0 
 tests/profiling/should_compile/all.T               |    6 +-
 tests/profiling/should_run/2592.stderr             |    3 -
 tests/profiling/should_run/{2592.hs => T2592.hs}   |    0 
 tests/profiling/should_run/T2592.stderr            |    3 +
 tests/profiling/should_run/T3001-2.hs              |    1 +
 tests/profiling/should_run/{5314.hs => T5314.hs}   |    0 
 .../should_run/T5314.stdout}                       |    0 
 tests/profiling/should_run/all.T                   |   12 +-
 tests/profiling/should_run/callstack001.stdout     |    4 +-
 tests/programs/10queens/test.T                     |    2 +-
 tests/programs/Queens/test.T                       |    2 +-
 tests/programs/andre_monad/test.T                  |    2 +-
 tests/programs/andy_cherry/test.T                  |    2 +-
 tests/programs/barton-mangler-bug/test.T           |    2 +-
 tests/programs/cholewo-eval/test.T                 |    2 +-
 tests/programs/cvh_unboxing/test.T                 |    2 +-
 tests/programs/fast2haskell/test.T                 |    2 +-
 tests/programs/fun_insts/test.T                    |    2 +-
 tests/programs/galois_raytrace/test.T              |    2 +-
 tests/programs/hs-boot/hs-boot.stderr              |    2 +-
 tests/programs/jl_defaults/test.T                  |    2 +-
 tests/programs/joao-circular/test.T                |    2 +-
 tests/programs/jq_readsPrec/test.T                 |    2 +-
 tests/programs/jtod_circint/test.T                 |    2 +-
 tests/programs/jules_xref/test.T                   |    2 +-
 tests/programs/jules_xref2/test.T                  |    2 +-
 tests/programs/launchbury/test.T                   |    2 +-
 tests/programs/lennart_range/test.T                |    2 +-
 tests/programs/lex/test.T                          |    2 +-
 tests/programs/life_space_leak/test.T              |    4 +-
 tests/programs/maessen-hashtab/test.T              |    2 +-
 tests/programs/north_array/test.T                  |    2 +-
 tests/programs/okeefe_neural/test.T                |    4 +-
 tests/programs/record_upd/test.T                   |    2 +-
 tests/programs/rittri/test.T                       |    2 +-
 tests/programs/sanders_array/test.T                |    2 +-
 tests/programs/seward-space-leak/test.T            |    2 +-
 tests/programs/strict_anns/test.T                  |    2 +-
 tests/programs/thurston-modular-arith/test.T       |    2 +-
 tests/quasiquotation/T3953.stderr                  |    2 +-
 tests/quasiquotation/qq005/test.T                  |    2 +-
 tests/quasiquotation/qq006/test.T                  |    2 +-
 tests/quasiquotation/qq007/test.T                  |    2 +-
 tests/quasiquotation/qq008/test.T                  |    2 +-
 tests/rebindable/rebindable6.stderr                |   14 +-
 tests/rename/prog002/rename.prog002.stderr         |    2 +-
 tests/rename/prog003/rename.prog003.stderr         |    2 +-
 tests/rename/should_compile/T1789.stderr           |   16 +-
 tests/rename/should_compile/T1972.stderr           |   16 +-
 tests/rename/should_compile/{2334.hs => T2334.hs}  |    0 
 tests/rename/should_compile/T2435.hs               |    4 +
 tests/rename/should_compile/T2435Foo.hs            |    3 +
 tests/rename/should_compile/T3103/T3103.stderr     |    2 +-
 tests/rename/should_compile/T3262.stderr-ghc       |   12 +-
 tests/rename/should_compile/T3371.stderr           |    2 +-
 tests/rename/should_compile/T3449.stderr           |    2 +-
 tests/rename/should_compile/T3823.stderr           |    6 +-
 tests/rename/should_compile/T4003A.hs-boot         |    2 +-
 tests/rename/should_compile/T4489.stderr           |    8 +-
 tests/rename/should_compile/T5331.stderr           |   20 +-
 tests/rename/should_compile/T5334.stderr           |   12 +-
 tests/rename/should_compile/T5867.stderr           |    4 +-
 tests/rename/should_compile/T7145b.stderr          |    2 +-
 tests/rename/should_compile/T7167.stderr           |    2 +-
 tests/rename/should_compile/T7336.stderr           |    2 +-
 tests/rename/should_compile/all.T                  |    6 +-
 tests/rename/should_compile/mc10.stderr-ghc        |    2 +-
 tests/rename/should_compile/rn037.stderr-ghc       |    8 +-
 tests/rename/should_compile/rn039.stderr-ghc       |    8 +-
 tests/rename/should_compile/rn040.stderr-ghc       |    4 +-
 tests/rename/should_compile/rn041.stderr-ghc       |    6 +-
 tests/rename/should_compile/rn046.stderr-ghc       |   12 +-
 tests/rename/should_compile/rn047.stderr-ghc       |    2 +-
 tests/rename/should_compile/rn050.stderr           |    4 +-
 tests/rename/should_compile/rn063.stderr           |    4 +-
 tests/rename/should_compile/rn064.stderr           |    6 +-
 tests/rename/should_compile/rn066.stderr           |    4 +-
 tests/rename/should_fail/T1595a.stderr             |    2 +-
 tests/rename/should_fail/T2310.stderr              |    6 +-
 tests/rename/should_fail/T2723.stderr              |    6 +-
 tests/rename/should_fail/T2901.stderr              |    4 +-
 tests/rename/should_fail/T2993.stderr              |    2 +-
 tests/rename/should_fail/T3265.stderr              |    4 +-
 tests/rename/should_fail/T5211.stderr              |    4 +-
 tests/rename/should_fail/T5281.stderr              |    2 +-
 tests/rename/should_fail/T5372.stderr              |    6 +-
 tests/rename/should_fail/T5385.stderr              |    8 +-
 tests/rename/should_fail/T5533.stderr              |    2 +-
 tests/rename/should_fail/T5589.stderr              |    2 +-
 tests/rename/should_fail/T5657.stderr              |    2 +-
 tests/rename/should_fail/T5745.stderr              |    2 +-
 tests/rename/should_fail/T5892a.stderr             |    6 +-
 tests/rename/should_fail/T5892b.stderr             |    4 +-
 tests/rename/should_fail/T7164.stderr              |    2 +-
 tests/rename/should_fail/T7338.stderr              |    2 +-
 tests/rename/should_fail/T7338a.stderr             |    4 +-
 tests/rename/should_fail/T7454.stderr              |    2 +-
 tests/rename/should_fail/all.T                     |    2 +-
 tests/rename/should_fail/mc13.stderr               |    2 +-
 tests/rename/should_fail/mc14.stderr               |    2 +-
 tests/rename/should_fail/rn_dup.stderr             |    8 +-
 tests/rename/should_fail/rnfail001.stderr          |    4 +-
 tests/rename/should_fail/rnfail002.stderr          |    2 +-
 tests/rename/should_fail/rnfail003.stderr          |    2 +-
 tests/rename/should_fail/rnfail004.stderr          |    4 +-
 tests/rename/should_fail/rnfail007.stderr          |    2 +-
 tests/rename/should_fail/rnfail008.stderr          |    2 +-
 tests/rename/should_fail/rnfail009.stderr          |    2 +-
 tests/rename/should_fail/rnfail010.stderr          |    2 +-
 tests/rename/should_fail/rnfail011.stderr          |    2 +-
 tests/rename/should_fail/rnfail012.stderr          |    2 +-
 tests/rename/should_fail/rnfail013.stderr          |    2 +-
 tests/rename/should_fail/rnfail015.stderr          |    2 +-
 tests/rename/should_fail/rnfail017.stderr          |    4 +-
 tests/rename/should_fail/rnfail018.stderr          |    8 +-
 tests/rename/should_fail/rnfail019.stderr          |    6 +-
 tests/rename/should_fail/rnfail022.stderr          |    4 +-
 tests/rename/should_fail/rnfail023.stderr          |    6 +-
 tests/rename/should_fail/rnfail024.stderr          |    4 +-
 tests/rename/should_fail/rnfail025.stderr          |    2 +-
 tests/rename/should_fail/rnfail026.stderr          |    8 +-
 tests/rename/should_fail/rnfail027.stderr          |    2 +-
 tests/rename/should_fail/rnfail029.stderr          |   10 +-
 tests/rename/should_fail/rnfail030.stderr          |    2 +-
 tests/rename/should_fail/rnfail031.stderr          |    2 +-
 tests/rename/should_fail/rnfail032.stderr          |    8 +-
 tests/rename/should_fail/rnfail033.stderr          |    8 +-
 tests/rename/should_fail/rnfail034.stderr          |    4 +-
 tests/rename/should_fail/rnfail035.stderr          |    2 +-
 tests/rename/should_fail/rnfail040.stderr          |   10 +-
 tests/rename/should_fail/rnfail041.stderr          |    4 +-
 tests/rename/should_fail/rnfail043.stderr          |    2 +-
 tests/rename/should_fail/rnfail044.stderr          |   10 +-
 tests/rename/should_fail/rnfail045.stderr          |    4 +-
 tests/rename/should_fail/rnfail048.stderr          |    2 +-
 tests/rename/should_fail/rnfail049.stderr          |    2 +-
 tests/rename/should_fail/rnfail050.stderr          |    2 +-
 tests/rename/should_fail/rnfail053.stderr          |    2 +-
 tests/rename/should_fail/rnfail054.stderr          |    4 +-
 tests/rename/should_fail/rnfail055.stderr          |   40 +-
 tests/rename/should_fail/rnfail057.stderr          |    2 +-
 tests/rts/2783.stderr                              |    1 -
 tests/rts/4850.hs                                  |   31 -
 tests/rts/4850.stdout                              |    1 -
 tests/rts/5644/5644.stderr                         |    3 -
 tests/rts/5644/Makefile                            |    3 -
 tests/rts/5644/all.T                               |    7 -
 tests/rts/7087.stderr                              |    1 -
 tests/rts/Makefile                                 |   17 +-
 tests/rts/{2047.hs => T2047.hs}                    |    0 
 tests/rts/{2783.hs => T2783.hs}                    |    0 
 tests/rts/T2783.stderr                             |    1 +
 tests/rts/{3236.c => T3236.c}                      |    0 
 tests/rts/{3236.stderr => T3236.stderr}            |    0 
 tests/rts/{3424.hs => T3424.hs}                    |    0 
 tests/rts/{3424.stdout => T3424.stdout}            |    0 
 tests/rts/T4850.hs                                 |   32 +
 .../should_run/3561.stdout => rts/T4850.stdout}    |    0 
 tests/rts/{5250.hs => T5250.hs}                    |    0 
 tests/rts/{5644 => T5644}/Conf.hs                  |    0 
 .../should_compile => rts/T5644}/Makefile          |    0 
 tests/rts/{5644 => T5644}/ManyQueue.hs             |    0 
 tests/rts/T5644/T5644.stderr                       |    3 +
 tests/rts/{5644 => T5644}/Util.hs                  |    0 
 tests/rts/T5644/all.T                              |    7 +
 tests/rts/{5644 => T5644}/heap-overflow.hs         |    0 
 tests/rts/{5993.hs => T5993.hs}                    |    0 
 tests/rts/{5993.stdout => T5993.stdout}            |    0 
 tests/rts/T7037_main.c                             |    3 +-
 tests/rts/{7087.hs => T7087.hs}                    |    0 
 tests/rts/T7087.stderr                             |    1 +
 tests/rts/T7636.hs                                 |   13 +
 tests/rts/T7636.stderr                             |    1 +
 tests/rts/all.T                                    |  125 ++--
 tests/rts/stablename001.hs                         |   13 +
 .../cgrun033.stdout => rts/stablename001.stdout}   |    0 
 tests/safeHaskell/check/all.T                      |    2 +-
 tests/safeHaskell/check/pkg01/all.T                |    6 +-
 tests/safeHaskell/flags/SafeFlags22.stderr         |    2 +-
 tests/safeHaskell/flags/SafeFlags23.stderr         |    2 +-
 tests/safeHaskell/flags/SafeFlags25.stderr         |    2 +-
 tests/safeHaskell/flags/SafeFlags26.stderr         |    2 +-
 tests/safeHaskell/flags/all.T                      |    2 +-
 tests/safeHaskell/ghci/all.T                       |    6 +-
 tests/safeHaskell/ghci/p10.stderr                  |    2 +-
 tests/safeHaskell/ghci/p13.stderr                  |    4 +-
 tests/safeHaskell/ghci/p15.script                  |    2 +-
 tests/safeHaskell/ghci/p15.stderr                  |   12 +-
 tests/safeHaskell/ghci/p16.stderr                  |   12 +-
 tests/safeHaskell/ghci/p4.stderr                   |    6 +-
 tests/safeHaskell/ghci/p6.stderr                   |    4 +-
 tests/safeHaskell/ghci/p9.stderr                   |    2 +-
 .../safeHaskell/safeInfered/UnsafeInfered07.stderr |   18 +
 tests/safeHaskell/safeInfered/UnsafeInfered07_A.hs |    2 +-
 .../safeHaskell/safeInfered/UnsafeInfered11.stderr |    2 +-
 .../safeHaskell/safeInfered/UnsafeInfered12.stderr |    2 +-
 tests/safeHaskell/safeInfered/all.T                |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang07.stderr   |    6 +-
 tests/safeHaskell/safeLanguage/SafeLang10.stderr   |    4 +-
 tests/safeHaskell/safeLanguage/SafeLang13.hs       |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang14.hs       |    2 +-
 tests/safeHaskell/safeLanguage/all.T               |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport02.hs        |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport03.hs        |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport04.hs        |   12 -
 tests/safeHaskell/unsafeLibs/BadImport04.stderr    |    3 -
 tests/safeHaskell/unsafeLibs/BadImport09.hs        |   12 -
 tests/safeHaskell/unsafeLibs/BadImport09.stderr    |    4 -
 tests/safeHaskell/unsafeLibs/Dep01.hs              |   13 -
 tests/safeHaskell/unsafeLibs/Dep01.stderr          |    4 -
 tests/safeHaskell/unsafeLibs/Dep02.hs              |   16 -
 tests/safeHaskell/unsafeLibs/Dep02.stderr          |    4 -
 tests/safeHaskell/unsafeLibs/Dep03.hs              |    7 -
 tests/safeHaskell/unsafeLibs/Dep03.stderr          |    4 -
 tests/safeHaskell/unsafeLibs/Dep04.hs              |    8 -
 tests/safeHaskell/unsafeLibs/Dep04.stderr          |    5 -
 tests/safeHaskell/unsafeLibs/GoodImport03.hs       |    1 -
 tests/safeHaskell/unsafeLibs/all.T                 |    8 +-
 tests/simplCore/should_compile/EvalTest.stdout     |    2 +-
 tests/simplCore/should_compile/T3717.stderr        |   14 +-
 tests/simplCore/should_compile/T3772.stdout        |    6 +-
 tests/simplCore/should_compile/T4201.stdout        |    6 +-
 tests/simplCore/should_compile/T4398.stderr        |    5 +-
 tests/simplCore/should_compile/T4908.stderr        |   12 +-
 tests/simplCore/should_compile/T4930.stderr        |    6 +-
 tests/simplCore/should_compile/T5359b.stderr       |    2 +-
 tests/simplCore/should_compile/T6082-RULE.stderr   |    8 +-
 tests/simplCore/should_compile/T7360.stderr        |   47 +-
 tests/simplCore/should_compile/all.T               |    8 +-
 tests/simplCore/should_compile/simpl016.stderr     |    6 +-
 tests/simplCore/should_compile/simpl017.stderr     |   36 +-
 tests/simplCore/should_compile/simpl020.stderr     |   12 +-
 tests/simplCore/should_compile/spec-inline.stderr  |   16 +-
 tests/simplCore/should_run/all.T                   |    6 +-
 tests/simplCore/should_run/simplrun004.hs          |    2 +-
 tests/simplCore/should_run/simplrun010.hs          |   15 +-
 tests/simplCore/should_run/simplrun010.stderr      |    4 +-
 tests/stranal/should_run/T7649.hs                  |   32 +
 tests/stranal/should_run/T7649.stdout              |    6 +
 tests/stranal/should_run/all.T                     |    2 +-
 tests/th/2014/Makefile                             |    9 -
 tests/th/2014/all.T                                |    8 -
 tests/th/T1849.script                              |   10 +
 tests/th/T1849.stdout                              |    6 +
 tests/th/{2014 => T2014}/A.hs                      |    0 
 tests/th/{2014 => T2014}/A.hs-boot                 |    0 
 tests/th/{2014 => T2014}/B.hs                      |    0 
 tests/th/{2014 => T2014}/C.hs                      |    0 
 tests/th/T2014/Makefile                            |    9 +
 tests/th/T2014/all.T                               |    8 +
 tests/th/T2222.hs                                  |   36 ++
 tests/th/T2222.stderr                              |    5 +
 tests/th/T2597b.stderr                             |    2 +-
 tests/th/T2674.stderr                              |    2 +-
 tests/th/T2713.stderr                              |    8 +-
 tests/th/T3177a.stderr                             |   10 +-
 tests/th/T3395.stderr                              |    7 +-
 tests/th/T5358.stderr                              |   34 +-
 tests/th/T5795.stderr                              |    4 +-
 tests/th/T5971.stderr                              |    2 +-
 tests/th/T6114.stderr                              |    4 +-
 tests/th/T7276.stderr                              |    4 +-
 tests/th/T7276a.stdout                             |    8 +-
 tests/th/T7681.hs                                  |   12 +
 tests/th/TH_1tuple.stderr                          |    2 +-
 tests/th/TH_dupdecl.stderr                         |    2 +-
 tests/th/TH_emptycase.hs                           |    4 +-
 tests/th/TH_emptycase.stderr                       |    6 -
 tests/th/TH_exn1.stderr                            |    2 +-
 tests/th/TH_import_loop/TH_import_loop.T           |    2 +-
 tests/th/TH_runIO.stderr                           |    4 +-
 tests/th/TH_spliceD1.stderr                        |    4 +-
 tests/th/TH_spliceViewPat/test.T                   |    4 +-
 tests/th/TH_unresolvedInfix2.stderr                |    8 +-
 tests/th/all.T                                     |   13 +-
 tests/typecheck/bug1465/bug1465.stderr             |    6 +-
 tests/typecheck/prog001/test.T                     |    2 +-
 .../typecheck/prog001/typecheck.prog001.stderr-ghc |    7 +-
 tests/typecheck/prog002/test.T                     |    2 +-
 tests/typecheck/should_compile/FD1.stderr          |    6 +-
 tests/typecheck/should_compile/FD2.stderr          |   10 +-
 tests/typecheck/should_compile/FD3.stderr          |   10 +-
 tests/typecheck/should_compile/T2433.hs            |    4 +-
 tests/typecheck/should_compile/T2494.stderr        |   20 +-
 tests/typecheck/should_compile/T2497.stderr        |    2 +-
 tests/typecheck/should_compile/T5481.stderr        |    4 +-
 tests/typecheck/should_compile/T6055.hs            |    2 +-
 tests/typecheck/should_compile/T7050.stderr        |    6 +-
 tests/typecheck/should_compile/T7562.hs            |    3 +
 tests/typecheck/should_compile/T7562.stderr        |    5 +
 tests/typecheck/should_compile/all.T               |    9 +-
 tests/typecheck/should_compile/holes.hs            |    4 +-
 tests/typecheck/should_compile/holes.stderr        |   36 +-
 tests/typecheck/should_compile/holes2.hs           |    4 +-
 tests/typecheck/should_compile/holes2.stderr       |   24 +-
 tests/typecheck/should_compile/holes3.hs           |   10 +-
 tests/typecheck/should_compile/holes3.stderr       |   42 +-
 tests/typecheck/should_compile/tc056.stderr        |    6 +-
 tests/typecheck/should_compile/tc115.stderr-ghc    |    6 +-
 tests/typecheck/should_compile/tc116.stderr-ghc    |    6 +-
 tests/typecheck/should_compile/tc125.stderr-ghc    |   30 +-
 tests/typecheck/should_compile/tc126.stderr-ghc    |   12 +-
 tests/typecheck/should_compile/tc141.stderr        |   14 +-
 tests/typecheck/should_compile/tc161.stderr-ghc    |    6 +-
 tests/typecheck/should_compile/tc167.hs            |    2 +-
 tests/typecheck/should_compile/tc167.stderr        |    4 +-
 tests/typecheck/should_compile/tc168.stderr        |   10 +-
 tests/typecheck/should_compile/tc211.stderr        |   14 +-
 tests/typecheck/should_compile/tc226.hs            |    3 +-
 tests/typecheck/should_compile/tc231.stderr        |    6 +-
 tests/typecheck/should_compile/tc235.hs            |    2 +-
 tests/typecheck/should_compile/tc254.stderr        |    6 +-
 tests/typecheck/should_fail/AssocTyDef01.stderr    |    2 +-
 tests/typecheck/should_fail/AssocTyDef02.hs        |    3 +-
 tests/typecheck/should_fail/AssocTyDef02.stderr    |    6 +-
 tests/typecheck/should_fail/AssocTyDef03.stderr    |    4 +-
 tests/typecheck/should_fail/AssocTyDef04.stderr    |   10 +-
 tests/typecheck/should_fail/AssocTyDef05.stderr    |    4 +-
 tests/typecheck/should_fail/AssocTyDef06.stderr    |    4 +-
 tests/typecheck/should_fail/AssocTyDef07.stderr    |    2 +-
 tests/typecheck/should_fail/AssocTyDef08.stderr    |    2 +-
 tests/typecheck/should_fail/AssocTyDef09.stderr    |    2 +-
 tests/typecheck/should_fail/FDsFromGivens.stderr   |    8 +-
 .../should_fail/FailDueToGivenOverlapping.stderr   |    6 +-
 .../typecheck/should_fail/FrozenErrorTests.stderr  |   24 +-
 tests/typecheck/should_fail/IPFail.stderr          |    4 +-
 .../should_fail/LongWayOverlapping.stderr          |    6 +-
 tests/typecheck/should_fail/SCLoop.stderr          |    4 +-
 .../should_fail/SilentParametersOverlapping.stderr |    8 +-
 tests/typecheck/should_fail/T1595.stderr           |    4 +-
 tests/typecheck/should_fail/T1633.stderr           |    6 +-
 tests/typecheck/should_fail/T1897a.stderr          |   10 +-
 tests/typecheck/should_fail/T1899.stderr           |    8 +-
 tests/typecheck/should_fail/T2126.stderr           |    4 +-
 tests/typecheck/should_fail/T2247.hs               |   18 +
 tests/typecheck/should_fail/T2247.stderr           |    6 +
 tests/typecheck/should_fail/T2354.hs               |    7 +
 tests/typecheck/should_fail/T2354.stderr           |    6 +
 tests/typecheck/should_fail/T2414.stderr           |    4 +-
 tests/typecheck/should_fail/T2534.stderr           |    6 +-
 tests/typecheck/should_fail/T2538.stderr           |    6 +-
 tests/typecheck/should_fail/T2688.stderr           |   14 +-
 tests/typecheck/should_fail/T2714.stderr           |   12 +-
 tests/typecheck/should_fail/T2806.stderr           |    8 +-
 tests/typecheck/should_fail/T2846b.stderr          |    4 +-
 tests/typecheck/should_fail/T2994.stderr           |   18 +-
 tests/typecheck/should_fail/T3102.stderr           |    8 +-
 tests/typecheck/should_fail/T3176.stderr           |    4 +-
 tests/typecheck/should_fail/T3323.stderr           |    2 +-
 tests/typecheck/should_fail/T3406.stderr           |    6 +-
 tests/typecheck/should_fail/T3468.stderr           |    6 +-
 tests/typecheck/should_fail/T3540.stderr           |   20 +-
 tests/typecheck/should_fail/T3592.stderr           |    8 +-
 tests/typecheck/should_fail/T3613.stderr           |   14 +-
 tests/typecheck/should_fail/T3950.stderr           |    6 +-
 tests/typecheck/should_fail/T3966.stderr           |    6 +-
 tests/typecheck/should_fail/T4875.stderr           |    6 +-
 tests/typecheck/should_fail/T5051.stderr           |    8 +-
 tests/typecheck/should_fail/T5084.stderr           |    2 +-
 tests/typecheck/should_fail/T5095.stderr           |   56 +-
 tests/typecheck/should_fail/T5236.stderr           |    6 +-
 tests/typecheck/should_fail/T5246.stderr           |    4 +-
 tests/typecheck/should_fail/T5300.stderr           |   12 +-
 tests/typecheck/should_fail/T5570.stderr           |    6 +-
 tests/typecheck/should_fail/T5684.hs               |    2 +-
 tests/typecheck/should_fail/T5684.stderr           |   32 +-
 tests/typecheck/should_fail/T5689.stderr           |   24 +-
 tests/typecheck/should_fail/T5691.stderr           |   12 +-
 tests/typecheck/should_fail/T5853.stderr           |    2 +-
 tests/typecheck/should_fail/T5858.stderr           |    8 +-
 tests/typecheck/should_fail/T5957.stderr           |    2 +-
 tests/typecheck/should_fail/T5978.stderr           |    8 +-
 tests/typecheck/should_fail/T6001.stderr           |    2 +-
 tests/typecheck/should_fail/T6069.stderr           |   14 +-
 tests/typecheck/should_fail/T6078.stderr           |    2 +-
 tests/typecheck/should_fail/T6161.stderr           |    4 +-
 tests/typecheck/should_fail/T7019.stderr           |    4 +-
 tests/typecheck/should_fail/T7019a.stderr          |    6 +-
 tests/typecheck/should_fail/T7175.stderr           |    8 +-
 tests/typecheck/should_fail/T7210.stderr           |    6 +-
 tests/typecheck/should_fail/T7220.stderr           |    4 +-
 tests/typecheck/should_fail/T7264.stderr           |    8 +-
 tests/typecheck/should_fail/T7279.stderr           |    4 +-
 tests/typecheck/should_fail/T7368.stderr           |   14 +-
 tests/typecheck/should_fail/T7368a.stderr          |    4 +-
 tests/typecheck/should_fail/T7410.stderr           |    8 +-
 tests/typecheck/should_fail/T7453.stderr           |   24 +-
 tests/typecheck/should_fail/T7525.stderr           |    4 +-
 tests/typecheck/should_fail/T7545.stderr           |    2 +-
 tests/typecheck/should_fail/T7609.hs               |   11 +
 tests/typecheck/should_fail/T7609.stderr           |   11 +
 tests/typecheck/should_fail/T7645.hs               |    8 +
 tests/typecheck/should_fail/T7645.stderr           |    6 +
 tests/typecheck/should_fail/T7734.hs               |    5 +
 tests/typecheck/should_fail/T7734.stderr           |   18 +
 .../typecheck/should_fail/TcMultiWayIfFail.stderr  |    8 +-
 tests/typecheck/should_fail/all.T                  |    9 +-
 tests/typecheck/should_fail/fd-loop.stderr         |    8 +-
 tests/typecheck/should_fail/mc19.stderr            |    4 +-
 tests/typecheck/should_fail/mc20.stderr            |    2 +-
 tests/typecheck/should_fail/mc21.stderr            |    6 +-
 tests/typecheck/should_fail/mc22.stderr            |    6 +-
 tests/typecheck/should_fail/mc23.stderr            |    6 +-
 tests/typecheck/should_fail/mc24.stderr            |    6 +-
 tests/typecheck/should_fail/mc25.stderr            |    2 +-
 tests/typecheck/should_fail/tcfail001.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail002.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail003.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail004.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail005.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail006.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail007.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail008.stderr       |   20 +-
 tests/typecheck/should_fail/tcfail009.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail010.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail011.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail012.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail013.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail014.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail015.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail016.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail017.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail018.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail019.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail020.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail027.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail028.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail029.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail030.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail031.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail032.hs           |    2 +-
 tests/typecheck/should_fail/tcfail032.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail033.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail034.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail036.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail037.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail038.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail040.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail041.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail042.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail043.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail044.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail047.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail048.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail049.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail050.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail051.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail052.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail053.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail054.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail055.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail056.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail057.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail058.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail061.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail062.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail063.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail065.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail067.stderr       |   28 +-
 tests/typecheck/should_fail/tcfail068.stderr       |   40 +-
 tests/typecheck/should_fail/tcfail069.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail070.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail072.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail073.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail076.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail077.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail078.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail079.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail080.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail082.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail083.stderr       |   14 +-
 tests/typecheck/should_fail/tcfail084.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail085.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail086.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail088.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail090.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail092.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail097.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail098.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail099.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail100.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail101.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail102.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail103.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail104.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail106.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail107.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail108.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail109.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail110.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail112.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail113.stderr       |   16 +-
 tests/typecheck/should_fail/tcfail114.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail116.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail117.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail119.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail121.stderr       |    7 +-
 tests/typecheck/should_fail/tcfail122.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail123.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail125.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail127.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail128.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail129.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail130.stderr       |    5 +-
 tests/typecheck/should_fail/tcfail131.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail132.hs           |    2 +-
 tests/typecheck/should_fail/tcfail132.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail133.stderr       |   14 +-
 tests/typecheck/should_fail/tcfail134.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail135.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail136.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail137.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail139.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail140.stderr       |   32 +-
 tests/typecheck/should_fail/tcfail142.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail143.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail146.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail147.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail148.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail151.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail152.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail153.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail154.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail155.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail156.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail157.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail158.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail159.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail160.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail161.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail162.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail164.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail165.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail167.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail168.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail170.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail171.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail173.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail174.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail175.stderr       |   10 +-
 tests/typecheck/should_fail/tcfail176.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail177.stderr       |  114 ++--
 tests/typecheck/should_fail/tcfail178.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail179.stderr       |    8 +-
 tests/typecheck/should_fail/tcfail180.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail181.hs           |    2 +-
 tests/typecheck/should_fail/tcfail181.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail182.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail184.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail185.stderr       |   24 +-
 tests/typecheck/should_fail/tcfail186.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail187.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail189.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail190.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail191.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail192.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail193.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail194.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail195.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail196.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail197.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail198.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail199.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail200.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail201.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail203.stderr       |   32 +-
 tests/typecheck/should_fail/tcfail204.stderr       |   16 +-
 tests/typecheck/should_fail/tcfail206.stderr       |   16 +-
 tests/typecheck/should_fail/tcfail207.stderr       |   20 +-
 tests/typecheck/should_fail/tcfail208.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail209.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail209a.stderr      |    2 +-
 tests/typecheck/should_fail/tcfail210.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail211.stderr       |    7 +-
 tests/typecheck/should_fail/tcfail212.stderr       |   12 +-
 tests/typecheck/should_fail/tcfail213.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail214.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail215.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail216.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail217.stderr       |    2 +-
 tests/typecheck/should_run/T1735_Help/Basics.hs    |    9 +-
 tests/typecheck/should_run/T3731.hs                |    1 -
 tests/typecheck/should_run/T6117.stdout            |    1 +
 tests/typecheck/should_run/all.T                   |   28 +-
 tests/typecheck/should_run/tcrun035.stderr         |    6 +-
 tests/typecheck/testeq1/test.T                     |    2 +-
 timeout/timeout.py                                 |   85 ++--
 1356 files changed, 6019 insertions(+), 4669 deletions(-)

diff --cc tests/typecheck/should_compile/all.T
index ab5dccf,0fdb2ad..6d7d621
--- a/tests/typecheck/should_compile/all.T
+++ b/tests/typecheck/should_compile/all.T
@@@ -396,10 -396,4 +396,11 @@@ test('holes3', normal, compile_fail, ['
  test('T7408', normal, compile, [''])
  test('UnboxStrictPrimitiveFields', normal, compile, [''])
  test('T7541', normal, compile, [''])
+ test('T7562', normal, compile, [''])
 +test('TypeNatBasics', normal, compile, [''])
 +test('TypeNatAC', normal, compile, [''])
 +test('TypeNatVec', normal, compile, [''])
 +test('TypeNatNat1', normal, compile, [''])
 +
 +
 +





More information about the ghc-commits mailing list