[commit: unix] master: Small testsuite refactoring; no functional change (70030c7)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/70030c700ebb3123a27fae27d6daef52334ec9ab

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

commit 70030c700ebb3123a27fae27d6daef52334ec9ab
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 14 14:10:08 2013 +0000

    Small testsuite refactoring; no functional change

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

 tests/all.T |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/all.T b/tests/all.T
index 56dea8c..c849a69 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -14,18 +14,15 @@ test('forkprocess01', [ only_compiler_types(['ghc']),
 test('user001', normal, compile_and_run, ['-package unix'])
 test('resourceLimit', normal, compile_and_run, ['-package unix'])
 
-if config.platform == 'i386-unknown-freebsd':
-        conf = expect_fail
-else:
-        conf = normal
+x86FreeBsdFail = when(platform('i386-unknown-freebsd'), expect_fail)
 
-test('queryfdoption01', compose(omit_ways(['ghci']), compose(only_compiler_types(['ghc']), conf)),
+test('queryfdoption01', compose(omit_ways(['ghci']), compose(only_compiler_types(['ghc']), x86FreeBsdFail)),
 	compile_and_run, ['-package unix'])
-test('getEnvironment01', conf, compile_and_run, ['-package unix'])
-test('getEnvironment02', conf, compile_and_run, ['-package unix'])
-test('getGroupEntryForName', compose(conf, exit_code(1)), compile_and_run,
+test('getEnvironment01', x86FreeBsdFail, compile_and_run, ['-package unix'])
+test('getEnvironment02', x86FreeBsdFail, compile_and_run, ['-package unix'])
+test('getGroupEntryForName', compose(x86FreeBsdFail, exit_code(1)), compile_and_run,
      ['-package unix'])
-test('getUserEntryForName', compose(conf, exit_code(1)), compile_and_run,
+test('getUserEntryForName', compose(x86FreeBsdFail, exit_code(1)), compile_and_run,
      ['-package unix'])