summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-06-28 18:12:53 +0100
committerIan Lynagh <igloo@earth.li>2012-06-28 18:12:53 +0100
commit8542e255b25f7b31372a225addd95461946684ea (patch)
treeade897f9402133bdde14568a19dcdb6dbe7c6a6d /testsuite
parent478b36faff8f411174e64716034d71d1f6ba886d (diff)
parent4ae3075502dc9f86eaf66d65519ef2397021b850 (diff)
downloadhaskell-8542e255b25f7b31372a225addd95461946684ea.tar.gz
Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/perf/compiler/all.T7
1 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index d89c7a0d16..0679f4d5c9 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -30,9 +30,10 @@ test('T1969',
# hence 15% range.
if_wordsize(32,
compiler_stats_num_field('bytes allocated', 210000000,
- 270000000)),
+ 280000000)),
# expected value: 215582916 (x86/Windows)
# 221667908 (x86/OS X)
+ # 274932264 (x86/Linux)
if_wordsize(64,
compiler_stats_num_field('bytes allocated', 420000000,
580000000)),
@@ -124,9 +125,9 @@ test('T4801',
test('T3064',
[# expect_broken( 3064 ),
- # expected value: 9 (x86/Linux 30-03-2011):
+ # expected value: 14 (x86/Linux 28-06-2012):
if_wordsize(32,
- compiler_stats_range_field('peak_megabytes_allocated', 10, 14)),
+ compiler_stats_range_field('peak_megabytes_allocated', 14, 10)),
# expected value: 18 (amd64/Linux):
if_wordsize(64,
compiler_stats_num_field('peak_megabytes_allocated', 20, 28)),