Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/950322ef873978f99e8b3e7085cb180f095b766c >--------------------------------------------------------------- commit 950322ef873978f99e8b3e7085cb180f095b766c Merge: 6f7285c... 105758e... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Tue Oct 25 16:30:01 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/testsuite Conflicts: tests/ghci/scripts/all.T tests/concurrent/should_run/all.T | 2 +- tests/ghci/scripts/T5564.script | 4 ++++ tests/ghci/scripts/T5564.stderr | 9 +++++++++ .../scripts/T5564.stdout} | 0 tests/ghci/scripts/all.T | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --cc tests/ghci/scripts/all.T index add74a8,b1c1fa6..d8c1501 --- a/tests/ghci/scripts/all.T +++ b/tests/ghci/scripts/all.T @@@ -106,4 -106,4 +106,5 @@@ test('T5417', normal, ghci_script, ['T5 test('T5545', normal, ghci_script, ['T5545.script']) test('T5557', normal, ghci_script, ['T5557.script']) test('T5566', normal, ghci_script, ['T5566.script']) +test('GhciKinds', normal, ghci_script, ['GhciKinds.script']) + test('T5564', normal, ghci_script, ['T5564.script']) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
