[commit: testsuite] master: Some test fixes on Win64 (8fce1d0)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8fce1d0f7c497af0816432ce6911f7a57658a4d8

>---------------------------------------------------------------

commit 8fce1d0f7c497af0816432ce6911f7a57658a4d8
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue May 8 13:15:17 2012 +0100

    Some test fixes on Win64

>---------------------------------------------------------------

 tests/ffi/should_run/4038.hs |    5 -----
 tests/ffi/should_run/all.T   |    4 ++--
 tests/ghci/should_run/all.T  |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/ffi/should_run/4038.hs b/tests/ffi/should_run/4038.hs
index 8f52745..6211687 100644
--- a/tests/ffi/should_run/4038.hs
+++ b/tests/ffi/should_run/4038.hs
@@ -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
diff --git a/tests/ffi/should_run/all.T b/tests/ffi/should_run/all.T
index 30eba8e..15aa90a 100644
--- a/tests/ffi/should_run/all.T
+++ b/tests/ffi/should_run/all.T
@@ -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:
diff --git a/tests/ghci/should_run/all.T b/tests/ghci/should_run/all.T
index 89347eb..527461a 100644
--- a/tests/ghci/should_run/all.T
+++ b/tests/ghci/should_run/all.T
@@ -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,