diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-11 13:48:59 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-11 13:48:59 +0000 |
| commit | 240da00652d50fcd10f3062629cb561b04d19646 (patch) | |
| tree | 0b063a86e0c41a642478a4a16adf5b5f88508988 /testsuite/tests/ghci | |
| parent | 3d94d01a9e6618e4ad82b1ad6386b0620538683d (diff) | |
| download | haskell-240da00652d50fcd10f3062629cb561b04d19646.tar.gz | |
Replace 'if_os' and 'unless_os' with 'opsys'
The name 'os' clashes with a python library
Diffstat (limited to 'testsuite/tests/ghci')
| -rw-r--r-- | testsuite/tests/ghci/linking/all.T | 8 | ||||
| -rw-r--r-- | testsuite/tests/ghci/should_run/all.T | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T index bd87173c84..d4724ca1ee 100644 --- a/testsuite/tests/ghci/linking/all.T +++ b/testsuite/tests/ghci/linking/all.T @@ -12,8 +12,8 @@ test('ghcilink002', test('ghcilink003', [ - if_os('mingw32', expect_broken(5289)), # still cannot load libstdc++ - # on Windows. See also #4468. + # still cannot load libstdc++ on Windows. See also #4468. + when(opsys('mingw32'), expect_broken(5289)), skip_if_no_ghci, extra_clean(['dir003/*','dir003']) ], @@ -34,8 +34,8 @@ test('ghcilink005', test('ghcilink006', [ - if_os('mingw32', expect_broken(5289)), # still cannot load libstdc++ - # on Windows. See also #4468. + # still cannot load libstdc++ on Windows. See also #4468. + when(opsys('mingw32'), expect_broken(5289)), skip_if_no_ghci, extra_clean(['dir006/*','dir006']) ], diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T index a2552f6f93..fa03ac1167 100644 --- a/testsuite/tests/ghci/should_run/all.T +++ b/testsuite/tests/ghci/should_run/all.T @@ -12,7 +12,7 @@ test('T2589', just_ghci, compile_and_run, ['']) test('T2881', just_ghci, compile_and_run, ['']) test('T3171', - [if_os('mingw32',skip), + [when(opsys('mingw32'),skip), req_interp, combined_output], run_command, |