[commit: testsuite] master: Merge branch 'master' of http://darcs.haskell.org/testsuite (34b7a00)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/34b7a005061cc0d9e7223acd85a3550c5446ba4b

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

commit 34b7a005061cc0d9e7223acd85a3550c5446ba4b
Merge: cdadbfb... 299134c...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jul 23 15:50:58 2012 +0100

    Merge branch 'master' of http://darcs.haskell.org/testsuite
    
    Conflicts:
    	tests/simplCore/should_compile/all.T

 tests/driver/T7060.hs                              |    8 ++++++--
 tests/gadt/T3638.hs                                |    1 +
 tests/indexed-types/should_compile/Rules1.hs       |    1 +
 tests/indexed-types/should_compile/T2291.hs        |    4 ++--
 tests/safeHaskell/safeInfered/UnsafeInfered05_A.hs |    1 +
 tests/safeHaskell/safeInfered/UnsafeInfered11_A.hs |    2 ++
 tests/simplCore/should_compile/T6082-RULE.hs       |   16 ++++++++++++++++
 tests/simplCore/should_compile/T6082-RULE.stderr   |    8 ++++++++
 tests/simplCore/should_compile/all.T               |    1 +
 tests/simplCore/should_compile/simpl011.hs         |    1 +
 tests/typecheck/should_compile/T2494-2.hs          |    1 +
 tests/typecheck/should_compile/T2497.hs            |    5 ++++-
 tests/typecheck/should_compile/T2497.stderr        |    2 +-
 tests/typecheck/should_compile/tc111.hs            |    1 +
 14 files changed, 46 insertions(+), 6 deletions(-)

diff --cc tests/simplCore/should_compile/all.T
index 4cf95c8,5805182..1471933
--- a/tests/simplCore/should_compile/all.T
+++ b/tests/simplCore/should_compile/all.T
@@@ -147,4 -147,4 +147,5 @@@ test('T4138'
       extra_clean(['T4138_A.hi', 'T4138_A.o', 'T4138.simpl']),
       run_command,
       ['$MAKE -s --no-print-directory T4138'])
 +test('T7088', normal, compile, [''])
+ test('T6082-RULE', normal, compile, [''])