[commit: testsuite] master: Merge branch 'master' into atomics (5cad49d)

[git at git.haskell.org]

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

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

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

commit 5cad49d42e434130671c3d14692d73d56253fab8
Merge: d7f5812 d7f3ee3
Author: Ryan Newton <rrnewton at gmail.com>
Date:   Fri Aug 30 22:45:46 2013 -0400

    Merge branch 'master' into atomics



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

5cad49d42e434130671c3d14692d73d56253fab8
 tests/deriving/should_fail/Roles10.stderr         |    2 +-
 tests/deriving/should_fail/Roles11.stderr         |    2 +-
 tests/deriving/should_fail/Roles8.stderr          |    2 +-
 tests/deriving/should_fail/Roles9.stderr          |    2 +-
 tests/deriving/should_fail/T1496.stderr           |    2 +-
 tests/deriving/should_fail/T2721.stderr           |    2 +-
 tests/deriving/should_fail/T4846.stderr           |    2 +-
 tests/deriving/should_fail/T7148.stderr           |    2 +-
 tests/deriving/should_fail/T7148a.stderr          |    2 +-
 tests/driver/T4437.hs                             |    1 +
 tests/gadt/CasePrune.stderr                       |    2 +-
 tests/ghci/linking/all.T                          |    3 +-
 tests/ghci/scripts/T8113.script                   |   18 ++++++
 tests/ghci/scripts/T8113.stdout                   |   21 +++++++
 tests/ghci/scripts/T8172.script                   |    7 +++
 tests/ghci/scripts/T8172.stdout                   |   11 ++++
 tests/ghci/scripts/all.T                          |    2 +
 tests/indexed-types/should_compile/Overlap14.hs   |   12 ++--
 tests/indexed-types/should_fail/Overlap15.hs      |   16 ++++++
 tests/indexed-types/should_fail/Overlap15.stderr  |    7 +++
 tests/indexed-types/should_fail/T8155.hs          |   30 ++++++++++
 tests/indexed-types/should_fail/T8155.stderr      |    9 +++
 tests/indexed-types/should_fail/all.T             |    2 +
 tests/numeric/should_run/NumDecimals.hs           |    4 ++
 tests/numeric/should_run/NumDecimals.stdout       |    1 +
 tests/numeric/should_run/all.T                    |    1 +
 tests/perf/compiler/all.T                         |    4 +-
 tests/perf/haddock/all.T                          |    6 +-
 tests/perf/should_run/all.T                       |    2 +-
 tests/rts/Makefile                                |   21 +++++++
 tests/{driver/T706a.hs => rts/Test.hs}            |    7 +--
 tests/rts/all.T                                   |    7 ++-
 tests/rts/atomicinc.c                             |    2 -
 tests/rts/linker_unload.c                         |   62 +++++++++++++++++++++
 tests/rts/linker_unload.stdout                    |    1 +
 tests/simplCore/should_compile/T3717.stderr       |    2 +-
 tests/simplCore/should_compile/T4908.stderr       |    2 +-
 tests/simplCore/should_compile/spec-inline.stderr |    5 +-
 tests/th/T7064.stdout                             |    2 +-
 tests/th/T8186.hs                                 |   11 ++++
 tests/th/T8186.stdout                             |    3 +
 tests/th/TH_Roles2.stderr                         |    2 +-
 tests/th/all.T                                    |    2 +
 tests/typecheck/should_compile/Tc263_Help.hs      |    7 +++
 tests/typecheck/should_compile/all.T              |    4 ++
 tests/typecheck/should_compile/holes.stderr       |   17 +++++-
 tests/typecheck/should_compile/holes2.stderr      |    1 +
 tests/typecheck/should_compile/holes3.stderr      |   17 +++++-
 tests/typecheck/should_compile/tc262.hs           |   13 +++++
 tests/typecheck/should_compile/tc263.hs           |   12 ++++
 tests/typecheck/should_fail/Tcfail218_Help.hs     |    7 +++
 tests/typecheck/should_fail/all.T                 |    3 +
 tests/typecheck/should_fail/tcfail218.hs          |   12 ++++
 tests/typecheck/should_fail/tcfail218.stderr      |   11 ++++
 54 files changed, 373 insertions(+), 37 deletions(-)