Commit bea606f2 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/testsuite

parents ce2f9ebc df3027ee
......@@ -2,21 +2,23 @@
test('haddock.base',
[unless_in_tree_compiler(skip)
,if_wordsize(64,
stats_range_field('peak_megabytes_allocated', 249, 10))
stats_range_field('peak_megabytes_allocated', 274, 10))
# 2012-08-14: 240 (amd64/Linux)
# 2012-09-18: 237 (amd64/Linux)
# 2012-11-12: 249 (amd64/Linux)
# 2013-01-29: 274 (amd64/Linux)
,if_wordsize(32,
stats_num_field('peak_megabytes_allocated', 110,
115))
# 2012-08-14: 144 (x86/OSX)
# 2012-10-30: 113 (x86/Windows)
,if_wordsize(64,
stats_range_field('max_bytes_used', 87265136, 10))
stats_range_field('max_bytes_used', 96022312, 10))
# 2012-08-14: 87374568 (amd64/Linux)
# 2012-08-21: 86428216 (amd64/Linux)
# 2012-09-20: 84794136 (amd64/Linux)
# 2012-11-12: 87265136 (amd64/Linux)
# 2013-01-29: 96022312 (amd64/Linux)
,if_wordsize(32,
stats_range_field('max_bytes_used', 45574928, 1))
# 2012-08-14: 45574928 (x86/OSX)
......
......@@ -120,7 +120,9 @@ test('T5113',
stats_num_field('bytes allocated', 8000000,
9000000)),
only_ways(['normal']),
expect_broken(7046)
normal
# WAS: expect_broken(7046)
# but it started working again around 01/2013, see #7046
],
compile_and_run,
['-O'])
......
......@@ -112,8 +112,7 @@ test('exec_signals', [
test('return_mem_to_os', normal, compile_and_run, [''])
test('T4850', extra_clean(['T4850.o','T4850.hi','T4850']),
run_command, ['$MAKE -s --no-print-directory T4850'])
test('T4850', normal, run_command, ['$MAKE -s --no-print-directory T4850'])
def config_T5250(opts):
if not (config.arch in ['i386','x86_64']):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment