[commit: base] master: Follow testsuite changes (91fc409)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/91fc4098e561ba3d9d44d58701b0bdbaad7cd997

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

commit 91fc4098e561ba3d9d44d58701b0bdbaad7cd997
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Feb 8 19:55:35 2013 +0000

    Follow testsuite changes

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

 tests/IO/all.T      |    4 ++--
 tests/Numeric/all.T |    4 ++--
 tests/all.T         |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/IO/all.T b/tests/IO/all.T
index 18b3b14..3437981 100644
--- a/tests/IO/all.T
+++ b/tests/IO/all.T
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-def expect_fail_if_windows(opts):
+def expect_fail_if_windows(name, opts):
    f = if_os('mingw32', expect_fail);
-   return f(opts);
+   return f(normal, opts);
 
 test('IOError001', compose(omit_ways(['ghci']), set_stdin('IOError001.hs')),
 	compile_and_run, [''])
diff --git a/tests/Numeric/all.T b/tests/Numeric/all.T
index 1c8ef16..1c6e9ea 100644
--- a/tests/Numeric/all.T
+++ b/tests/Numeric/all.T
@@ -7,7 +7,7 @@ test('num006', normal, compile_and_run, [''])
 test('num007', normal, compile_and_run, [''])
 test('num008', normal, compile_and_run, [''])
 test('num009', [ skip_if_fast
-               , if_platform('i386-apple-darwin', expect_broken(2370))
+               , when(platform('i386-apple-darwin'), expect_broken(2370))
                , if_os('mingw32', omit_ways(['ghci'])) ],
                # We get different results at 1e20 on x86/Windows, so there is
                # a special output file for that.  I (SDM) don't think these are
@@ -16,6 +16,6 @@ test('num009', [ skip_if_fast
                # I'm skipping that way altogether.
              compile_and_run, [''])
 test('num010',
-     if_platform('i386-apple-darwin', expect_broken_for(7043, 'ghci')),
+     when(platform('i386-apple-darwin'), expect_broken_for(7043, 'ghci')),
      compile_and_run,
      [''])
diff --git a/tests/all.T b/tests/all.T
index 05b639b..1344a83 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -9,11 +9,11 @@ test('assert', exit_code(1), compile_and_run, ['-fno-ignore-asserts'])
 test('CPUTime001', normal, compile_and_run, [''])
 test('readLitChar',   normal, compile_and_run, [''])
 test('unicode001',
-     if_platform('i386-unknown-openbsd', expect_fail),
+     when(platform('i386-unknown-openbsd'), expect_fail),
      compile_and_run,
      [''])
 test('unicode002',
-     if_platform('i386-unknown-openbsd', expect_fail),
+     when(platform('i386-unknown-openbsd'), expect_fail),
      compile_and_run,
      [''])
 test('data-fixed-show-read', normal, compile_and_run, [''])