[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (47a1350)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/testsuite/commit/47a1350cc457b73f6cd12690dff007f6b60766dc

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

commit 47a1350cc457b73f6cd12690dff007f6b60766dc
Merge: 6182247... 1e37f2b...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 08:44:50 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 mk/ghc-config.hs                                   |    1 +
 mk/test.mk                                         |    7 +++-
 tests/driver/dynamicToo/A001.hs                    |    6 ---
 tests/driver/dynamicToo/A002.hs                    |    6 ---
 tests/driver/dynamicToo/B001.hs                    |    6 ---
 tests/driver/dynamicToo/B001_1.hs                  |    6 ---
 tests/driver/dynamicToo/B001_2.hs                  |    6 ---
 tests/driver/dynamicToo/B002.hs                    |    6 ---
 tests/driver/dynamicToo/C001.hs                    |    9 -----
 tests/driver/dynamicToo/C002.hs                    |    9 -----
 tests/driver/dynamicToo/Makefile                   |   37 --------------------
 tests/driver/dynamicToo/all.T                      |   22 +-----------
 tests/driver/dynamicToo/dynamicToo001/A.hs         |    6 +++
 tests/driver/dynamicToo/dynamicToo001/B.hs         |    6 +++
 tests/driver/dynamicToo/dynamicToo001/B1.hs        |    6 +++
 tests/driver/dynamicToo/dynamicToo001/B2.hs        |    6 +++
 tests/driver/dynamicToo/dynamicToo001/C.hs         |    9 +++++
 tests/driver/dynamicToo/dynamicToo001/Makefile     |   23 ++++++++++++
 .../{ => dynamicToo001}/dynamicToo001.stdout       |    0 
 tests/driver/dynamicToo/dynamicToo001/test.T       |   13 +++++++
 tests/driver/dynamicToo/dynamicToo002/A.hs         |    6 +++
 tests/driver/dynamicToo/dynamicToo002/B.hs         |    6 +++
 tests/driver/dynamicToo/dynamicToo002/C.hs         |    9 +++++
 tests/driver/dynamicToo/dynamicToo002/Makefile     |   23 ++++++++++++
 tests/driver/dynamicToo/dynamicToo002/test.T       |   11 ++++++
 tests/runghc/T7859.stderr-mingw32                  |    1 +
 26 files changed, 133 insertions(+), 113 deletions(-)