diff options
Diffstat (limited to 'testsuite/tests/programs')
27 files changed, 29 insertions, 159 deletions
diff --git a/testsuite/tests/programs/10queens/test.T b/testsuite/tests/programs/10queens/test.T index ac0435150e..28ebc1f2f3 100644 --- a/testsuite/tests/programs/10queens/test.T +++ b/testsuite/tests/programs/10queens/test.T @@ -1,6 +1,2 @@ -test('10queens', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) +test('10queens', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/Queens/test.T b/testsuite/tests/programs/Queens/test.T index 77cf3750b5..24ff04f898 100644 --- a/testsuite/tests/programs/Queens/test.T +++ b/testsuite/tests/programs/Queens/test.T @@ -1,6 +1,2 @@ -test('queens', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o'])], - compile_and_run, - ['']) +test('queens', [when(fast(), skip)], compile_and_run, ['']) diff --git a/testsuite/tests/programs/andre_monad/test.T b/testsuite/tests/programs/andre_monad/test.T index e76b0f13e7..eeee41e800 100644 --- a/testsuite/tests/programs/andre_monad/test.T +++ b/testsuite/tests/programs/andre_monad/test.T @@ -1,7 +1,2 @@ -test('andre_monad', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o']), - ], - multimod_compile_and_run, +test('andre_monad', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/andy_cherry/test.T b/testsuite/tests/programs/andy_cherry/test.T index 511eac5051..72508fc423 100644 --- a/testsuite/tests/programs/andy_cherry/test.T +++ b/testsuite/tests/programs/andy_cherry/test.T @@ -1,14 +1,3 @@ -test('andy_cherry', - [when(fast(), skip), - extra_clean(['DataTypes.hi', 'DataTypes.o', - 'GenUtils.hi', 'GenUtils.o', - 'Interp.hi', 'Interp.o', - 'InterpUtils.hi', 'InterpUtils.o', - 'Main.hi', 'Main.o', - 'Parser.hi', 'Parser.o', - 'PrintTEX.hi', 'PrintTEX.o']), - extra_run_opts('.')], - multimod_compile_and_run, - ['Main', '-cpp']) - +test('andy_cherry', [when(fast(), skip), extra_run_opts('.')], + multimod_compile_and_run, ['Main', '-cpp']) diff --git a/testsuite/tests/programs/cholewo-eval/test.T b/testsuite/tests/programs/cholewo-eval/test.T index 3b418d4ac1..71fd6a1932 100644 --- a/testsuite/tests/programs/cholewo-eval/test.T +++ b/testsuite/tests/programs/cholewo-eval/test.T @@ -1,5 +1,2 @@ -test('cholewo-eval', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o', 'Arr.hi', 'Arr.o'])], - multimod_compile_and_run, +test('cholewo-eval', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/cvh_unboxing/test.T b/testsuite/tests/programs/cvh_unboxing/test.T index abea53b354..4d088119e4 100644 --- a/testsuite/tests/programs/cvh_unboxing/test.T +++ b/testsuite/tests/programs/cvh_unboxing/test.T @@ -1,8 +1,2 @@ -test('cvh_unboxing', - [when(fast(), skip), - extra_clean(['Append.hi', 'Append.o', - 'Main.hi', 'Main.o', - 'Types.hi', 'Types.o'])], - multimod_compile_and_run, +test('cvh_unboxing', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/fast2haskell/test.T b/testsuite/tests/programs/fast2haskell/test.T index 621c589188..90ca0be52c 100644 --- a/testsuite/tests/programs/fast2haskell/test.T +++ b/testsuite/tests/programs/fast2haskell/test.T @@ -1,8 +1,3 @@ -test('fast2haskell', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o', - 'Fast2haskell.hi', 'Fast2haskell.o'])], - multimod_compile_and_run, +test('fast2haskell', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/fun_insts/test.T b/testsuite/tests/programs/fun_insts/test.T index 98bcf3a32f..bd3276a28f 100644 --- a/testsuite/tests/programs/fun_insts/test.T +++ b/testsuite/tests/programs/fun_insts/test.T @@ -1,6 +1,2 @@ -test('fun_insts', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) - +test('fun_insts', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/galois_raytrace/test.T b/testsuite/tests/programs/galois_raytrace/test.T index 94defefc6a..f563553993 100644 --- a/testsuite/tests/programs/galois_raytrace/test.T +++ b/testsuite/tests/programs/galois_raytrace/test.T @@ -3,22 +3,5 @@ if config.platform.startswith('i386-') and \ config.platform != 'i386-unknown-openbsd': setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded'])) -test('galois_raytrace', - [when(fast(), skip), - extra_clean(['CSG.hi', 'CSG.o', - 'Construct.hi', 'Construct.o', - 'Data.hi', 'Data.o', - 'Eval.hi', 'Eval.o', - 'Geometry.hi', 'Geometry.o', - 'Illumination.hi', 'Illumination.o', - 'Intersections.hi', 'Intersections.o', - 'Interval.hi', 'Interval.o', - 'Main.hi', 'Main.o', - 'Misc.hi', 'Misc.o', - 'Parse.hi', 'Parse.o', - 'Primitives.hi', 'Primitives.o', - 'Surface.hi', 'Surface.o']), - reqlib('parsec')], - multimod_compile_and_run, - ['Main','-package parsec']) - +test('galois_raytrace', [when(fast(), skip), reqlib('parsec')], + multimod_compile_and_run, ['Main', '-package parsec']) diff --git a/testsuite/tests/programs/hs-boot/all.T b/testsuite/tests/programs/hs-boot/all.T index dba72877e9..3790c88c9f 100644 --- a/testsuite/tests/programs/hs-boot/all.T +++ b/testsuite/tests/programs/hs-boot/all.T @@ -1,9 +1,4 @@ # This test is for bug #906, a problem with the ordering of # compilations involving .hs-boot files, fixed in 6.6. -test('hs-boot', - extra_clean(['A.hi', 'A.hi-boot', 'A.o', 'A.o-boot', - 'B.hi', 'B.o', 'C.hi', 'C.o', - 'Main', 'Main.exe', 'Main.hi', 'Main.o']), - multimod_compile, - ['Main -v0', '']) +test('hs-boot', [], multimod_compile, ['Main -v0', '']) diff --git a/testsuite/tests/programs/jl_defaults/test.T b/testsuite/tests/programs/jl_defaults/test.T index b17c0b8cb5..4b75ffaef5 100644 --- a/testsuite/tests/programs/jl_defaults/test.T +++ b/testsuite/tests/programs/jl_defaults/test.T @@ -1,6 +1,3 @@ -test('jl_defaults', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('jl_defaults', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/jq_readsPrec/test.T b/testsuite/tests/programs/jq_readsPrec/test.T index dcad28cd7b..4d7ec4d730 100644 --- a/testsuite/tests/programs/jq_readsPrec/test.T +++ b/testsuite/tests/programs/jq_readsPrec/test.T @@ -1,6 +1,3 @@ -test('jq_readsPrec', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('jq_readsPrec', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/jtod_circint/test.T b/testsuite/tests/programs/jtod_circint/test.T index b6ad840a26..69be1661b8 100644 --- a/testsuite/tests/programs/jtod_circint/test.T +++ b/testsuite/tests/programs/jtod_circint/test.T @@ -1,10 +1,3 @@ -test('jtod_circint', - [when(fast(), skip), - extra_clean(['Bit.hi', 'Bit.o', - 'LogFun.hi', 'LogFun.o', - 'Main.hi', 'Main.o', - 'Signal.hi', 'Signal.o'])], - multimod_compile_and_run, +test('jtod_circint', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/jules_xref/test.T b/testsuite/tests/programs/jules_xref/test.T index 25c1023507..32b484f07e 100644 --- a/testsuite/tests/programs/jules_xref/test.T +++ b/testsuite/tests/programs/jules_xref/test.T @@ -1,7 +1 @@ -test('jules_xref', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o']), - ], - multimod_compile_and_run, - ['Main', '']) - +test('jules_xref', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/jules_xref2/test.T b/testsuite/tests/programs/jules_xref2/test.T index 2e627ab89c..f220128b3f 100644 --- a/testsuite/tests/programs/jules_xref2/test.T +++ b/testsuite/tests/programs/jules_xref2/test.T @@ -1,6 +1,3 @@ -test('jules_xref2', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('jules_xref2', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/launchbury/test.T b/testsuite/tests/programs/launchbury/test.T index 0af619f4c1..fb7db1d751 100644 --- a/testsuite/tests/programs/launchbury/test.T +++ b/testsuite/tests/programs/launchbury/test.T @@ -1,6 +1,2 @@ -test('launchbury', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) - +test('launchbury', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/lennart_range/test.T b/testsuite/tests/programs/lennart_range/test.T index 0cc5a351f5..68c27238e2 100644 --- a/testsuite/tests/programs/lennart_range/test.T +++ b/testsuite/tests/programs/lennart_range/test.T @@ -1,6 +1,3 @@ -test('lennart_range', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('lennart_range', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/lex/test.T b/testsuite/tests/programs/lex/test.T index 79459772a0..b70605d5ee 100644 --- a/testsuite/tests/programs/lex/test.T +++ b/testsuite/tests/programs/lex/test.T @@ -1,6 +1,2 @@ -test('lex', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) - +test('lex', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/life_space_leak/test.T b/testsuite/tests/programs/life_space_leak/test.T index a6d634a8f6..fe72a2567f 100644 --- a/testsuite/tests/programs/life_space_leak/test.T +++ b/testsuite/tests/programs/life_space_leak/test.T @@ -1,6 +1,2 @@ -test('life_space_leak', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('life_space_leak', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/north_array/test.T b/testsuite/tests/programs/north_array/test.T index d822897d59..986087b0f1 100644 --- a/testsuite/tests/programs/north_array/test.T +++ b/testsuite/tests/programs/north_array/test.T @@ -1,6 +1,3 @@ -test('north_array', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('north_array', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/okeefe_neural/test.T b/testsuite/tests/programs/okeefe_neural/test.T index e7e1f78c01..7f0282df97 100644 --- a/testsuite/tests/programs/okeefe_neural/test.T +++ b/testsuite/tests/programs/okeefe_neural/test.T @@ -10,9 +10,5 @@ def set_opts( name, opts ): opts.expect = 'fail' -test('okeefe_neural', - [when(fast(), skip), - set_opts, - extra_clean(['Main.hi'])], - multimod_compile_and_run, +test('okeefe_neural', [when(fast(), skip), set_opts], multimod_compile_and_run, ['Main', '+RTS -M64m -RTS']) diff --git a/testsuite/tests/programs/record_upd/test.T b/testsuite/tests/programs/record_upd/test.T index 46149575b2..b8cdbadeec 100644 --- a/testsuite/tests/programs/record_upd/test.T +++ b/testsuite/tests/programs/record_upd/test.T @@ -1,6 +1,2 @@ -test('record_upd', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) - +test('record_upd', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/rittri/test.T b/testsuite/tests/programs/rittri/test.T index 57e7805ea3..9b2fcf4fc9 100644 --- a/testsuite/tests/programs/rittri/test.T +++ b/testsuite/tests/programs/rittri/test.T @@ -1,6 +1,2 @@ -test('rittri', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, - ['Main', '']) - +test('rittri', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/sanders_array/test.T b/testsuite/tests/programs/sanders_array/test.T index 6e0a8c6e79..e2e9b209fc 100644 --- a/testsuite/tests/programs/sanders_array/test.T +++ b/testsuite/tests/programs/sanders_array/test.T @@ -1,6 +1,3 @@ -test('sanders_array', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('sanders_array', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/seward-space-leak/test.T b/testsuite/tests/programs/seward-space-leak/test.T index 8c22eb50fa..935ebbf259 100644 --- a/testsuite/tests/programs/seward-space-leak/test.T +++ b/testsuite/tests/programs/seward-space-leak/test.T @@ -1,5 +1,2 @@ -test('seward-space-leak', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('seward-space-leak', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/strict_anns/test.T b/testsuite/tests/programs/strict_anns/test.T index e64ee2fb7b..b210abde72 100644 --- a/testsuite/tests/programs/strict_anns/test.T +++ b/testsuite/tests/programs/strict_anns/test.T @@ -1,6 +1,3 @@ -test('strict_anns', - [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])], - multimod_compile_and_run, +test('strict_anns', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - diff --git a/testsuite/tests/programs/thurston-modular-arith/test.T b/testsuite/tests/programs/thurston-modular-arith/test.T index dc6a221013..3a38db7a9e 100644 --- a/testsuite/tests/programs/thurston-modular-arith/test.T +++ b/testsuite/tests/programs/thurston-modular-arith/test.T @@ -1,8 +1,3 @@ # uses GHC-specific scoped type variables -test('thurston-modular-arith', - [when(fast(), skip), - extra_clean(['Main.hi', 'Main.o', 'TypeVal.hi', 'TypeVal.o']), - ], - multimod_compile_and_run, +test('thurston-modular-arith', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) - |