Commit 5f9c6425 authored by Ian Lynagh's avatar Ian Lynagh

Some test fixes on Win64

parent 07fadb7a
......@@ -22,12 +22,7 @@ foreign import ccall "dynamic" f_io :: FunPtr IOF -> IOF
-- On *nix systems, the C stack size can be examined and changed by
-- the "ulimit -s" command.
-- Stack size on Windows isn't as generous as on other OSes
#if defined(mingw32_HOST_OS) && defined(x86_64_HOST_ARCH)
n = 100
#else
n = 300
#endif
f :: Int -> IO Int
f 0 = return 42
......
......@@ -81,7 +81,7 @@ test('ffi011', normal, compile_and_run, [''])
# because it's difficult to discover whether a given Linux supports
# it.
if config.platform == 'i386-unknown-mingw32':
if config.os == 'mingw32':
skip_if_not_windows = normal
else:
skip_if_not_windows = skip
......@@ -161,7 +161,7 @@ test('ffi021', normal, compile_and_run, [''])
test('ffi022', normal, compile_and_run, [''])
if config.platform == 'i386-unknown-mingw32':
if config.os == 'mingw32':
# This test needs a larger C stack than we get by default on Windows
flagsFor4038 = ['-optl-Wl,--stack,10485760']
else:
......
......@@ -12,7 +12,7 @@ test('2589', just_ghci, compile_and_run, [''])
test('2881', just_ghci, compile_and_run, [''])
test('3171',
[if_platform('i386-unknown-mingw32',skip),
[if_os('mingw32',skip),
req_interp,
combined_output],
run_command,
......
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