Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
Conflicts:
tests/polykinds/all.T

1  2 
testsuite/tests/polykinds/all.T

@@@ -63,8 -63,10 +63,12 @@@ test('T7128', normal, compile,['']
  test('T7151', normal, compile_fail,[''])
  test('T7095', normal, compile,[''])
  test('T7090', normal, compile,[''])
- test('T7176', expect_broken(7176), compile,[''])
 +test('T7272',
 +     extra_clean(['T7272a.hi', 'T7272a.o']),
 +     multimod_compile,
 +     ['T7272.hs', '-v0'])
+ test('T7176', normal, compile,[''])
+ test('T7224', normal, compile_fail,[''])
+ test('T7230', normal, compile_fail,[''])
+ test('T7238', normal, compile,[''])
+ test('T7278', normal, compile_fail,[''])
 -
 -