[commit: testsuite] master: Merge branch 'master' of http://darcs.haskell.org//testsuite (31c1199)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master http://hackage.haskell.org/trac/ghc/changeset/31c1199806f2095533bf61d8653ad28907bbb364 >--------------------------------------------------------------- commit 31c1199806f2095533bf61d8653ad28907bbb364 Merge: 08fad4c... 0f271f0... Author: Simon Peyton Jones <[email protected]> Date: Fri Oct 26 11:10:51 2012 +0100 Merge branch 'master' of http://darcs.haskell.org//testsuite config/ghc | 3 +++ driver/testglobals.py | 3 +++ mk/test.mk | 9 +++++++++ tests/cabal/cabal01/Makefile | 2 +- tests/cabal/cabal01/all.T | 14 ++++++++++++-- tests/cabal/cabal03/Makefile | 8 ++++---- tests/cabal/cabal04/Makefile | 2 +- tests/cabal/cabal04/all.T | 11 ++++++++--- tests/cabal/ghcpkg03.stderr | 26 +++++++++++++------------- tests/cabal/ghcpkg05.stderr | 10 +++++----- tests/driver/1372/Makefile | 2 +- tests/driver/T4437.hs | 14 ++------------ tests/numeric/should_run/T7233.hs | 14 ++++++++++++++ tests/numeric/should_run/T7233.stdout | 10 ++++++++++ tests/numeric/should_run/all.T | 2 ++ tests/plugins/simple-plugin/Makefile | 2 +- tests/rename/prog006/Makefile | 10 ++++++++-- tests/safeHaskell/check/pkg01/Makefile | 24 +++++++++++++++--------- tests/safeHaskell/check/pkg01/all.T | 14 ++++++++++++-- tests/typecheck/bug1465/Makefile | 2 +- 20 files changed, 125 insertions(+), 57 deletions(-)