[commit: stm] master: follow changes in testsuite driver (f90ee91)

[Simon Marlow]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f90ee916977a050ee1086d1d2110d6f9cbad496f

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

commit f90ee916977a050ee1086d1d2110d6f9cbad496f
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Feb 18 11:01:31 2013 +0000

    follow changes in testsuite driver

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

 tests/all.T |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/all.T b/tests/all.T
index cab1e2b..07383d8 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -2,29 +2,30 @@ test('stm046', only_compiler_types(['ghc']), compile_and_run, [''])
 
 # Omit GHCi for these two, since they appear to deadlock (23/11/2004 --SDM)
 test('stm047',
-     composes([only_compiler_types(['ghc']), 
-               omit_ways(['ghci']),
-               if_compiler_lt('ghc', '6.9', omit_ways(['ghci', 'threaded2']))]),
+     [ only_compiler_types(['ghc']),
+       omit_ways(['ghci']),
+       when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2'])) ],
      compile_and_run, [''])
 test('stm048',
-     composes([only_compiler_types(['ghc']), 
-               omit_ways(['ghci']),
-               if_compiler_lt('ghc', '6.9', omit_ways(['ghci', 'threaded2']))]),
+     [ only_compiler_types(['ghc']),
+       omit_ways(['ghci']),
+       when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2'])) ],
      compile_and_run, [''])
 
 test('stm049', [ reqlib('random'), only_compiler_types(['ghc']) ],
                 compile_and_run, ['-package stm'])
-test('stm050', compose(only_compiler_types(['ghc']), extra_run_opts('10000')), compile_and_run, ['-package stm'])
+test('stm050', [ only_compiler_types(['ghc']),
+                 extra_run_opts('10000') ], compile_and_run, ['-package stm'])
 
 # Was failing prof ways due to #1547, but now apparently succeeds:
 test('stm052', [ reqlib('random'),
-                 if_compiler_lt('ghc', '6.9',
-                                expect_broken_for(1547,['profc','profasm'])) ],
+                 when(compiler_lt('ghc', '6.9'),
+                      expect_broken_for(1547,['profc','profasm'])) ],
      compile_and_run, ['-package stm'])
 
 test('stm053', [ reqlib('random'),
                  only_ways(['threaded1','threaded2']),
-                 if_platform('i386-unknown-mingw32', skip) ],
+                 when(platform('i386-unknown-mingw32'), skip) ],
                compile_and_run, ['-package stm'])
 test('stm054', normal, compile_and_run, ['-package stm'])
 test('stm055', exit_code(1), compile_and_run, ['-package stm'])
@@ -34,7 +35,7 @@ test('stm056', only_ways(['threaded1','threaded2']),
 test('stm060', normal, compile_and_run, ['-package stm'])
 test('stm061', normal, compile_and_run, ['-package stm'])
 test('stm062', normal, compile_and_run, ['-package stm'])
-test('stm063', skip_if_fast, compile_and_run, ['-package stm'])
+test('stm063', when(fast(),skip), compile_and_run, ['-package stm'])
 test('2411', ignore_output, compile_and_run, ['-package stm'])
 test('3049', normal, compile_and_run, ['-package stm'])
 test('4057', normal, compile_and_run, ['-package stm'])