[commit: testsuite] master: Adjust testsuite to new printf implementation (88a8ff9)
git at git.haskell.org
git at git.haskell.org
Tue Sep 17 22:17:08 CEST 2013
Repository : ssh://git@git.haskell.org/testsuite
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/88a8ff9031e21759e0496df56adc1305c2d74388/testsuite
>---------------------------------------------------------------
commit 88a8ff9031e21759e0496df56adc1305c2d74388
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Sep 17 12:21:47 2013 +0200
Adjust testsuite to new printf implementation
Expand 'bytes allocated' allowed in haddock.base, and update error
messages.
>---------------------------------------------------------------
88a8ff9031e21759e0496df56adc1305c2d74388
tests/perf/haddock/all.T | 3 ++-
tests/typecheck/should_fail/T7857.stderr | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/perf/haddock/all.T b/tests/perf/haddock/all.T
index 21c59c2..7f55fc8 100644
--- a/tests/perf/haddock/all.T
+++ b/tests/perf/haddock/all.T
@@ -25,12 +25,13 @@ test('haddock.base',
,(wordsize(32), 52237984, 1)])
# 2013-02-10: 52237984 (x86/OSX)
,stats_num_field('bytes allocated',
- [(wordsize(64), 6282746976, 5)
+ [(wordsize(64), 6634886456, 5)
# 2012-08-14: 5920822352 (amd64/Linux)
# 2012-09-20: 5829972376 (amd64/Linux)
# 2012-10-08: 5902601224 (amd64/Linux)
# 2013-01-17: 6064874536 (x86_64/Linux)
# 2013-02-10: 6282746976 (x86_64/Linux)
+ # 2013-09-17: 6634886456 (x86_64/Linux)
,(platform('i386-unknown-mingw32'), 3358693084, 1)
# 2013-02-10: 3358693084 (x86/Windows)
,(wordsize(32), 3146596848, 1)])
diff --git a/tests/typecheck/should_fail/T7857.stderr b/tests/typecheck/should_fail/T7857.stderr
index 6fdad87..d360c38 100644
--- a/tests/typecheck/should_fail/T7857.stderr
+++ b/tests/typecheck/should_fail/T7857.stderr
@@ -8,7 +8,8 @@ T7857.hs:8:11:
Note: there are several potential instances:
instance [safe] (PrintfArg a, PrintfType r) => PrintfType (a -> r)
-- Defined in ‛Text.Printf’
- instance [safe] PrintfType (IO a) -- Defined in ‛Text.Printf’
+ instance [safe] a ~ () => PrintfType (IO a)
+ -- Defined in ‛Text.Printf’
instance [safe] IsChar c => PrintfType [c]
-- Defined in ‛Text.Printf’
In the second argument of ‛($)’, namely ‛printf "" i’
More information about the ghc-commits
mailing list