[commit: testsuite] master: More Win64 test fixes (b5e2a59)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b5e2a59abc013f8ab81af24ab546d50b3f9fa728

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

commit b5e2a59abc013f8ab81af24ab546d50b3f9fa728
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue May 8 13:23:18 2012 +0100

    More Win64 test fixes

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

 tests/driver/all.T    |    2 +-
 tests/lib/win32/all.T |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/driver/all.T b/tests/driver/all.T
index d721f22..8c9bb40 100644
--- a/tests/driver/all.T
+++ b/tests/driver/all.T
@@ -295,7 +295,7 @@ test('2499', normal, compile_fail, [''])
 test('mode001', normal, run_command,
      ['$MAKE -s --no-print-directory mode001'])
 
-if config.platform == 'i386-unknown-mingw32':
+if config.os == 'mingw32':
      only_windows = normal
 else:
      only_windows = skip
diff --git a/tests/lib/win32/all.T b/tests/lib/win32/all.T
index 1e9378a..ccb0bdd 100644
--- a/tests/lib/win32/all.T
+++ b/tests/lib/win32/all.T
@@ -1,7 +1,6 @@
 def win_only(opts):
-    if config.platform != "i386-unknown-mingw32" and \
-       config.platform != "i386-unknown-cygwin32":
-	opts.skip = 1
+    if config.os != "mingw32" and config.os != "cygwin32":
+        opts.skip = 1
 
 # This isn't a very good test to run automatically at the moment, since
 # it doesn't terminate