Follow changes in the testsuite

4 files changed, 6 insertions, 6 deletions

diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 34379812e9..5eca472bf9 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 def expect_fail_if_windows(name, opts):
-   f = if_os('mingw32', expect_fail);
+   f = when(opsys('mingw32'), expect_fail);
    return f(normal, opts);
 
 test('IOError001', compose(omit_ways(['ghci']), set_stdin('IOError001.hs')),
@@ -119,7 +119,7 @@ test('concio002', reqlib('process'), compile_and_run, [''])
 
 test('T2122', extra_clean(['T2122-test']), compile_and_run, [''])
 test('T3307',
-     [if_msys(expect_broken(5599)),
+     [when(msys(), expect_broken(5599)),
       extra_clean(['chinese-file-小说', 'chinese-name'])],
      run_command,
      ['$MAKE -s --no-print-directory T3307-test'])
@@ -144,7 +144,7 @@ test('encoding001',
 test('encoding002', normal, compile_and_run, [''])
 
 test('environment001',
-     [if_msys(expect_broken(5599)),
+     [when(msys(), expect_broken(5599)),
       extra_clean(['environment001'])],
      run_command,
      ['$MAKE -s --no-print-directory environment001-test'])
diff --git a/libraries/base/tests/Numeric/all.T b/libraries/base/tests/Numeric/all.T
index 1c6e9ea5db..a6779b0c36 100644
--- a/libraries/base/tests/Numeric/all.T
+++ b/libraries/base/tests/Numeric/all.T
@@ -8,7 +8,7 @@ test('num007', normal, compile_and_run, [''])
 test('num008', normal, compile_and_run, [''])
 test('num009', [ skip_if_fast
                , when(platform('i386-apple-darwin'), expect_broken(2370))
-               , if_os('mingw32', omit_ways(['ghci'])) ],
+               , when(opsys('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
                # serious, since the results for lower numbers are all fine.
diff --git a/libraries/base/tests/System/all.T b/libraries/base/tests/System/all.T
index 60ce86c207..96f362eb85 100644
--- a/libraries/base/tests/System/all.T
+++ b/libraries/base/tests/System/all.T
@@ -4,6 +4,6 @@ test('getArgs001',  normal, compile_and_run, [''])
 test('getEnv001',   normal, compile_and_run, [''])
 test('T5930',   normal, compile_and_run, [''])
 
-test('system001',   if_os("mingw32", expect_fail), \
+test('system001',   when(opsys("mingw32"), expect_fail), \
 	compile_and_run, [''])
 
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 1344a83354..0efbed95b3 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -114,7 +114,7 @@ test('weak001', normal, compile_and_run, [''])
 #     cat: write error: Permission denied
 # Seems to be a known problem, e.g.
 #     http://mingw-users.1079350.n2.nabble.com/Bug-re-Unicode-on-the-console-td3121717.html
-test('T4006', if_msys(expect_fail), compile_and_run, [''])
+test('T4006', when(msys(), expect_fail), compile_and_run, [''])
 
 test('T5943', normal, compile_and_run, [''])
 test('T5962', normal, compile_and_run, [''])