[commit: testsuite] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics (8948d4f)
José Pedro Magalhães
jpm at cs.uu.nl
Thu May 12 15:52:26 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/8948d4fdfb103033929e669bbb377724b5e4f896
>---------------------------------------------------------------
commit 8948d4fdfb103033929e669bbb377724b5e4f896
Merge: 8a83877... 3404241...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date: Mon May 9 14:06:06 2011 +0200
Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics
tests/ghc-regress/codeGen/should_compile/all.T | 3 +-
tests/ghc-regress/codeGen/should_run/5149.hs | 8 +
.../should_run/5149.stdout} | 0
tests/ghc-regress/codeGen/should_run/5149_cmm.cmm | 29 +++
tests/ghc-regress/codeGen/should_run/Makefile | 7 +
tests/ghc-regress/codeGen/should_run/all.T | 3 +
tests/ghc-regress/ghci/prog011/prog011.stderr | 2 +-
.../parser/should_compile/EmptyDecls.hs} | 0
tests/ghc-regress/parser/should_compile/all.T | 1 +
tests/ghc-regress/parser/should_fail/all.T | 1 +
.../ghc-regress/parser/should_fail/readFail047.hs | 9 +
.../parser/should_fail/readFail047.stderr | 2 +
tests/ghc-regress/parser/should_run/all.T | 2 +
tests/ghc-regress/parser/should_run/operator.hs | 23 ++
.../ghc-regress/parser/should_run/operator.stdout | 8 +
.../parser/should_run/operator2.hs} | 0
.../parser/should_run/operator2.stdout} | 0
tests/ghc-regress/perf/compiler/all.T | 12 +-
tests/ghc-regress/perf/should_run/all.T | 9 +-
.../{array/should_run => programs/Queens}/Makefile | 0
.../{h98 => ghc-regress/programs}/Queens/queens.hs | 0
.../programs/Queens/queens.stdout} | 0
tests/ghc-regress/programs/Queens/test.T | 6 +
tests/ghc-regress/rebindable/DoParamM.stderr | 6 +-
tests/ghc-regress/rebindable/T4851.hs | 12 +
tests/ghc-regress/rebindable/all.T | 1 +
tests/ghc-regress/typecheck/should_compile/all.T | 1 +
.../typecheck/should_compile/tc249.hs} | 0
tests/ghc-regress/typecheck/should_fail/all.T | 1 +
.../typecheck/should_fail/tcfail208.hs} | 0
.../typecheck/should_fail/tcfail208.stderr | 13 +
tests/h98/Array/largeArray.T | 12 -
tests/h98/Array/largeArray.expect.stdout | 1 -
tests/h98/Array/largeArray.hs | 10 -
tests/h98/Directory/getDCs.T | 16 --
tests/h98/Directory/getDCs.hs | 9 -
tests/h98/EmptyDecls/edecls.T | 12 -
tests/h98/EmptyDecls/edecls.expect.stdout | 1 -
tests/h98/Enum/all.T | 22 --
tests/h98/Enum/list.expected.stdout | 1 -
tests/h98/Enum/list.hs | 2 -
tests/h98/Enum/succ.expect.stdout | 1 -
tests/h98/Enum/succ.hs | 1 -
tests/h98/N+K/nplusk.T | 12 -
tests/h98/N+K/nplusk.expect.stdout | 1 -
tests/h98/N+K/nplusk.hs | 15 --
tests/h98/Queens/queens.T | 12 -
tests/h98/chr/chr1.T | 12 -
tests/h98/chr/chr1.expected.stdout | 1 -
tests/h98/chr/chr1.hs | 10 -
tests/h98/chr/testconfig.T | 13 -
tests/h98/ctxsimpl/all.T | 24 --
tests/h98/ctxsimpl/bad/testconfig.T | 16 --
tests/h98/fields/all.T | 54 -----
tests/h98/fields/empty.hs | 9 -
tests/h98/fields/operator.expected.stdout | 2 -
tests/h98/fields/operator.hs | 11 -
tests/h98/fields/puns.hs | 5 -
tests/h98/fields/puns/testconfig.T | 16 --
tests/h98/fields/showread.expect.stdout | 2 -
tests/h98/fields/showread.hs | 18 --
tests/h98/fields/type.expect.stdout | 1 -
tests/h98/fields/type.hs | 15 --
tests/h98/float/show.T | 12 -
tests/h98/float/show.hs | 5 -
tests/h98/identifiers/all.T | 18 --
tests/h98/identifiers/qual.hs | 2 -
tests/h98/identifiers/twiddle.hs | 4 -
tests/h98/infix/all.T | 52 ----
tests/h98/infix/fndecl.hs | 10 -
tests/h98/infix/infix.expect.stdout | 1 -
tests/h98/infix/infix.hs | 17 --
tests/h98/infix/local.expect.stdout | 1 -
tests/h98/infix/local.hs | 6 -
tests/h98/infix/minus.expect.stdout | 1 -
tests/h98/infix/minus.hs | 4 -
tests/h98/layout/bad/testconfig.T | 16 --
tests/h98/layout/bad1.T | 16 --
tests/h98/layout/bad1.hs | 8 -
tests/h98/run | 16 --
tests/libraries/Data/Makefile | 36 ---
tests/libraries/Data/reference/Map.hs | 221 -----------------
tests/libraries/Data/reference/Set.hs | 75 ------
tests/libraries/Data/templates/BenchmarkMap.hs | 70 ------
tests/libraries/Data/templates/TestColl.hs | 42 ----
tests/libraries/Data/templates/TestMap.hs | 100 --------
tests/libraries/Data/templates/TestSet.hs | 76 ------
tests/libraries/Data/templates/TestSoundMap.hs | 250 --------------------
tests/libraries/Data/templates/TestSoundSet.hs | 154 ------------
tests/libraries/Data/test_List.hs | 31 ---
tests/libraries/Data/tools/InstancesTestGen.hs | 54 -----
tests/libraries/Data/tools/LibTest.hs | 92 -------
tests/libraries/Data/tools/SoundnessTestGen.hs | 120 ----------
tests/libraries/Makefile | 3 -
tests/libraries/base/fixed-arith/all.T | 6 -
tests/libraries/base/fixed-arith/fixed.hs | 25 --
tests/libraries/base/fixed-arith/fixed.stdout | 72 ------
tests/libraries/base/io/should_run/all.T | 6 -
tests/libraries/base/io/should_run/tempfiles.hs | 19 --
.../libraries/base/io/should_run/tempfiles.stdout | 4 -
100 files changed, 146 insertions(+), 1995 deletions(-)
diff --cc tests/ghc-regress/typecheck/should_compile/all.T
index 9388c16,83be8a5..c830989
--- a/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/tests/ghc-regress/typecheck/should_compile/all.T
@@@ -337,5 -342,7 +337,6 @@@ test('T4912', extra_clean(['T4912a.hi'
test('T4952', normal, compile, [''])
test('T4969', normal, compile, [''])
-
test('T5120', normal, compile, [''])
test('mc18', expect_broken_for(4370, ['hpc']), compile, [''])
+ test('tc249', normal, compile, [''])
More information about the Cvs-ghc
mailing list