Commit 995b512c authored by chak@cse.unsw.edu.au.'s avatar chak@cse.unsw.edu.au.
Browse files

Fix remaining test failures on OS X/x86_64

* Adapted the limits of two performance tests for OS X/x86_64
* ghci/linking tests need to use .dylib for shared libraries on OS X

Zero test failures on OS X/x86_64 (for the first time, I think)! Let's keep it that way.
parent a7ae775f
......@@ -20,6 +20,8 @@ ghcilink001 :
ifeq "$(WINDOWS)" "YES"
DLL = $1.dll
else ifeq "$(DARWIN)" "YES"
DLL = lib$1.dylib
else
DLL = lib$1.so
endif
......
......@@ -27,10 +27,11 @@ test('T1969',
# 221667908 (x86/OS X)
if_wordsize(64,
compiler_stats_num_field('bytes allocated', 420000000,
550000000)),
580000000)),
# 17/11/2009: 434,845,560 (amd64/Linux)
# 08/12/2009: 459,776,680 (amd64/Linux)
# 17/05/2010: 519,377,728 (amd64/Linux)
# 05/08/2011: 561,382,568 (amd64/OS X)
only_ways(['normal'])
],
compile,
......@@ -79,16 +80,18 @@ test('T4801',
if_wordsize(32,
compiler_stats_num_field('peak_megabytes_allocated', 30, 40)),
# expected value: 66 (amd64/Linux):
# expected value: 72 (amd64/OS X):
if_wordsize(64,
compiler_stats_num_field('peak_megabytes_allocated', 55, 70)),
compiler_stats_num_field('peak_megabytes_allocated', 55, 75)),
# expected value: 353463196 (x86/Windows)
if_wordsize(32,
compiler_stats_num_field('bytes allocated', 330000000,
370000000)),
# expected value: 145038576 (amd64/Linux):
# expected value: 145038576 (amd64/Linux): ?? makes no sense -=chak
# expected value: 813714032 (amd64/OS X):
if_wordsize(64,
compiler_stats_num_field('bytes allocated', 600000000,
750000000)),
850000000)),
# expected value: 14181360 (x86/Linux)
if_wordsize(32,
compiler_stats_num_field('max_bytes_used', 11000000,
......
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