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

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

parents 4c68c2f9 2ed1fdf4
test('2317',
[skip_if_fast,
reqlib('parallel')],
reqlib('parallel'), reqlib('random')],
multimod_compile_and_run,
['2317',''])
......@@ -82,9 +82,9 @@ test('T4801',
if_wordsize(32,
# expected value x86/OSX: 27
compiler_stats_num_field('peak_megabytes_allocated', 25, 29)),
# expected value: 48-49 (amd64/Linux):
# expected value: 48-54 (amd64/Linux):
if_wordsize(64,
compiler_stats_num_field('peak_megabytes_allocated', 47, 50)),
compiler_stats_num_field('peak_megabytes_allocated', 47, 54)),
# expected value: 58 (amd64/OS X):
if_platform('x86_64-apple-darwin',
compiler_stats_num_field('peak_megabytes_allocated', 56, 60)),
......@@ -103,7 +103,7 @@ test('T4801',
if_wordsize(32,
# expected value: x86/OS X: 9651948
compiler_stats_num_field('max_bytes_used', 9000000,
10000000)),
12000000)),
# expected value: 18188272 (amd64/Linux)
# 10290952 (windows)
if_wordsize(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