Follow testsuite changes

libraries/base/tests/IO/all.T

 # -*- 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, [''])

libraries/base/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,
      [''])

libraries/base/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, [''])