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

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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/d2e05e49f869699d84d75e72b1ea947f0de5864d

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

commit d2e05e49f869699d84d75e72b1ea947f0de5864d
Merge: 063c8db... 4f6baef...
Author: Richard Eisenberg <[email protected]>
Date:   Fri Dec 21 19:11:38 2012 -0500

    Merge branch 'master' into overlapping-tyfams
    
    Conflicts:
    	tests/th/all.T

 config/ghc                                         |    3 +
 driver/testglobals.py                              |    3 +
 driver/testlib.py                                  |   36 ++++++++++++
 mk/test.mk                                         |    9 +++-
 tests/codeGen/should_run/Word2Float.hs             |   17 ++++++
 tests/codeGen/should_run/Word2Float.stdout         |    4 +
 tests/codeGen/should_run/all.T                     |    1 +
 tests/driver/dynamicToo/A001.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/C001.hs                    |    9 +++
 tests/driver/dynamicToo/Makefile                   |   23 +++++++
 tests/driver/dynamicToo/all.T                      |   13 ++++
 tests/driver/dynamicToo/dynamicToo001.stdout       |    4 +
 tests/ffi/should_fail/T7506.hs                     |    6 ++
 tests/ffi/should_fail/T7506.stderr                 |    7 ++
 tests/ffi/should_fail/all.T                        |    1 +
 tests/generics/GenCanDoRep1.hs                     |    4 +
 tests/ghc-api/T7478/A.hs                           |    6 ++
 tests/ghc-api/T7478/B.hs                           |    4 +
 tests/ghc-api/T7478/C.hs                           |    4 +
 tests/ghc-api/T7478/Makefile                       |   11 ++++
 tests/ghc-api/T7478/T7478.hs                       |   61 ++++++++++++++++++++
 tests/ghc-api/T7478/T7478.stdout                   |    8 +++
 tests/ghc-api/T7478/all.T                          |    2 +
 tests/indexed-types/should_compile/T7474.hs        |   17 ++++++
 tests/indexed-types/should_compile/T7489.hs        |   12 ++++
 tests/indexed-types/should_compile/all.T           |    2 +
 tests/parser/should_compile/T7476/Makefile         |   10 +++
 tests/parser/should_compile/T7476/T7476.hs         |    2 +
 tests/parser/should_compile/T7476/T7476.stdout     |    1 +
 tests/parser/should_compile/T7476/all.T            |    6 ++
 tests/perf/compiler/all.T                          |    4 +-
 tests/perf/should_run/Conversions.hs               |   21 +++++++
 tests/perf/should_run/Conversions.stdout           |    2 +
 tests/perf/should_run/all.T                        |   12 ++++
 tests/plugins/simple-plugin/Simple/Plugin.hs       |    2 +-
 tests/polykinds/T7488.hs                           |    8 +++
 tests/polykinds/T7502.hs                           |    4 +
 tests/polykinds/all.T                              |    2 +
 tests/rename/should_fail/rnfail055.stderr          |    2 +-
 tests/th/Makefile                                  |    3 +
 tests/th/T7445.hs                                  |    6 ++
 tests/th/T7445a.hs                                 |   13 ++++
 tests/th/all.T                                     |    3 +
 .../should_compile/UnboxStrictPrimitiveFields.hs   |   28 +++++++++
 tests/typecheck/should_compile/all.T               |    3 +-
 tests/typecheck/should_fail/all.T                  |    2 +-
 49 files changed, 419 insertions(+), 6 deletions(-)

diff --cc tests/th/all.T
index 4ac8bf5,78e7655..1a97cff
--- a/tests/th/all.T
+++ b/tests/th/all.T
@@@ -255,8 -255,6 +255,11 @@@ test('T7092', extra_clean(['T7092a.hi',
  test('T7276', normal, compile_fail, ['-v0'])
  test('T7276a', combined_output, ghci_script, ['T7276a.script'])
  
 +test('TH_TyInstWhere1', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
 +test('TH_TyInstWhere2', normal, compile, ['-v0'])
 +test('TH_TyInstWhere3', normal, compile, ['-v0'])
 +test('TH_TyInstWhere4', normal, compile, ['-v0'])
 +
+ test('T7445', extra_clean(['T7445a.hi', 'T7445a.o']),
+ 	      run_command,
+ 	      ['$MAKE -s --no-print-directory T7445'] )