diff options
Diffstat (limited to 'testsuite/tests/programs')
29 files changed, 57 insertions, 29 deletions
diff --git a/testsuite/tests/programs/10queens/test.T b/testsuite/tests/programs/10queens/test.T index 28ebc1f2f3..dcf9479dfa 100644 --- a/testsuite/tests/programs/10queens/test.T +++ b/testsuite/tests/programs/10queens/test.T @@ -1,2 +1,3 @@ -test('10queens', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('10queens', [extra_files(['Main.hs']), + when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/andre_monad/test.T b/testsuite/tests/programs/andre_monad/test.T index eeee41e800..7218d92a7c 100644 --- a/testsuite/tests/programs/andre_monad/test.T +++ b/testsuite/tests/programs/andre_monad/test.T @@ -1,2 +1,3 @@ -test('andre_monad', [when(fast(), skip)], multimod_compile_and_run, +test('andre_monad', [extra_files(['Main.hs']), + 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 72508fc423..b1e87ff122 100644 --- a/testsuite/tests/programs/andy_cherry/test.T +++ b/testsuite/tests/programs/andy_cherry/test.T @@ -1,3 +1,4 @@ -test('andy_cherry', [when(fast(), skip), extra_run_opts('.')], +test('andy_cherry', [extra_files(['DataTypes.hs', 'GenUtils.hs', 'Interp.hs', 'InterpUtils.hs', 'Main.hs', 'Parser.hs', 'PrintTEX.hs', 'mygames.pgn']), + when(fast(), skip), extra_run_opts('.')], multimod_compile_and_run, ['Main', '-cpp']) diff --git a/testsuite/tests/programs/barton-mangler-bug/test.T b/testsuite/tests/programs/barton-mangler-bug/test.T index 5a141fc659..dcccf8e758 100644 --- a/testsuite/tests/programs/barton-mangler-bug/test.T +++ b/testsuite/tests/programs/barton-mangler-bug/test.T @@ -1,5 +1,6 @@ test('barton-mangler-bug', - [when(fast(), skip), + [extra_files(['Basic.hs', 'Expected.hs', 'Main.hs', 'Physical.hs', 'Plot.lhs', 'PlotExample.lhs', 'TypesettingTricks.hs']), + when(fast(), skip), extra_clean(['Basic.hi', 'Basic.o', 'Expected.hi', 'Expected.o', 'Main.hi', 'Main.o', diff --git a/testsuite/tests/programs/cholewo-eval/test.T b/testsuite/tests/programs/cholewo-eval/test.T index 71fd6a1932..83c6499408 100644 --- a/testsuite/tests/programs/cholewo-eval/test.T +++ b/testsuite/tests/programs/cholewo-eval/test.T @@ -1,2 +1,3 @@ -test('cholewo-eval', [when(fast(), skip)], multimod_compile_and_run, +test('cholewo-eval', [extra_files(['Arr.lhs', 'Main.lhs']), + 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 4d088119e4..d0ed5e09cb 100644 --- a/testsuite/tests/programs/cvh_unboxing/test.T +++ b/testsuite/tests/programs/cvh_unboxing/test.T @@ -1,2 +1,3 @@ -test('cvh_unboxing', [when(fast(), skip)], multimod_compile_and_run, +test('cvh_unboxing', [extra_files(['Append.lhs', 'Main.lhs', 'Types.lhs']), + 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 90ca0be52c..6c99b05f1d 100644 --- a/testsuite/tests/programs/fast2haskell/test.T +++ b/testsuite/tests/programs/fast2haskell/test.T @@ -1,3 +1,4 @@ -test('fast2haskell', [when(fast(), skip)], multimod_compile_and_run, +test('fast2haskell', [extra_files(['Fast2haskell.hs', 'Main.hs']), + 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 bd3276a28f..6dc2ad470f 100644 --- a/testsuite/tests/programs/fun_insts/test.T +++ b/testsuite/tests/programs/fun_insts/test.T @@ -1,2 +1,3 @@ -test('fun_insts', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('fun_insts', [extra_files(['Main.hs']), + 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 f563553993..6f65800cb2 100644 --- a/testsuite/tests/programs/galois_raytrace/test.T +++ b/testsuite/tests/programs/galois_raytrace/test.T @@ -3,5 +3,6 @@ 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), reqlib('parsec')], +test('galois_raytrace', [extra_files(['CSG.hs', 'Construct.hs', 'Data.hs', 'Eval.hs', 'Geometry.hs', 'Illumination.hs', 'Intersections.hs', 'Interval.hs', 'Main.hs', 'Misc.hs', 'Parse.hs', 'Primitives.hs', 'Surface.hs', 'galois.gml']), + 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 3790c88c9f..b8f7452037 100644 --- a/testsuite/tests/programs/hs-boot/all.T +++ b/testsuite/tests/programs/hs-boot/all.T @@ -1,4 +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', [], multimod_compile, ['Main -v0', '']) +test('hs-boot', [extra_files(['A.hs', 'A.hs-boot', 'B.hs', 'C.hs', 'Main.hs'])], multimod_compile, ['Main -v0', '']) diff --git a/testsuite/tests/programs/jl_defaults/test.T b/testsuite/tests/programs/jl_defaults/test.T index 4b75ffaef5..bafee003e5 100644 --- a/testsuite/tests/programs/jl_defaults/test.T +++ b/testsuite/tests/programs/jl_defaults/test.T @@ -1,3 +1,4 @@ -test('jl_defaults', [when(fast(), skip)], multimod_compile_and_run, +test('jl_defaults', [extra_files(['Main.hs']), + when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T index 589add0b57..dcc3c0aa29 100644 --- a/testsuite/tests/programs/joao-circular/test.T +++ b/testsuite/tests/programs/joao-circular/test.T @@ -1,5 +1,6 @@ test('joao-circular', - [when(fast(), skip), + [extra_files(['Data_Lazy.hs', 'Funcs_Lexer.hs', 'Funcs_Parser_Lazy.hs', 'LrcPrelude.hs', 'Main.hs', 'Visfun_Lazy.hs', 'inp']), + when(fast(), skip), when(doing_ghci(), extra_hc_opts('-fobject-code')), extra_clean(['Data_Lazy.hi', 'Data_Lazy.o', 'Funcs_Lexer.hi', 'Funcs_Lexer.o', diff --git a/testsuite/tests/programs/jq_readsPrec/test.T b/testsuite/tests/programs/jq_readsPrec/test.T index 4d7ec4d730..3484074d16 100644 --- a/testsuite/tests/programs/jq_readsPrec/test.T +++ b/testsuite/tests/programs/jq_readsPrec/test.T @@ -1,3 +1,4 @@ -test('jq_readsPrec', [when(fast(), skip)], multimod_compile_and_run, +test('jq_readsPrec', [extra_files(['Main.hs']), + 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 69be1661b8..0d873665ba 100644 --- a/testsuite/tests/programs/jtod_circint/test.T +++ b/testsuite/tests/programs/jtod_circint/test.T @@ -1,3 +1,4 @@ -test('jtod_circint', [when(fast(), skip)], multimod_compile_and_run, +test('jtod_circint', [extra_files(['Bit.hs', 'LogFun.hs', 'Main.hs', 'Signal.hs']), + 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 32b484f07e..3988761d97 100644 --- a/testsuite/tests/programs/jules_xref/test.T +++ b/testsuite/tests/programs/jules_xref/test.T @@ -1 +1,2 @@ -test('jules_xref', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('jules_xref', [extra_files(['Main.hs']), + 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 f220128b3f..b6903690e3 100644 --- a/testsuite/tests/programs/jules_xref2/test.T +++ b/testsuite/tests/programs/jules_xref2/test.T @@ -1,3 +1,4 @@ -test('jules_xref2', [when(fast(), skip)], multimod_compile_and_run, +test('jules_xref2', [extra_files(['Main.hs']), + 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 fb7db1d751..0da4ede9fd 100644 --- a/testsuite/tests/programs/launchbury/test.T +++ b/testsuite/tests/programs/launchbury/test.T @@ -1,2 +1,3 @@ -test('launchbury', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('launchbury', [extra_files(['Main.hs']), + 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 68c27238e2..8589f37838 100644 --- a/testsuite/tests/programs/lennart_range/test.T +++ b/testsuite/tests/programs/lennart_range/test.T @@ -1,3 +1,4 @@ -test('lennart_range', [when(fast(), skip)], multimod_compile_and_run, +test('lennart_range', [extra_files(['Main.hs']), + 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 b70605d5ee..3f84764c9f 100644 --- a/testsuite/tests/programs/lex/test.T +++ b/testsuite/tests/programs/lex/test.T @@ -1,2 +1,3 @@ -test('lex', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('lex', [extra_files(['Main.hs']), + 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 fe72a2567f..90efd45754 100644 --- a/testsuite/tests/programs/life_space_leak/test.T +++ b/testsuite/tests/programs/life_space_leak/test.T @@ -1,2 +1,3 @@ -test('life_space_leak', [when(fast(), skip)], multimod_compile_and_run, +test('life_space_leak', [extra_files(['Main.hs']), + when(fast(), skip)], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/programs/maessen-hashtab/test.T b/testsuite/tests/programs/maessen-hashtab/test.T index e21d2bb1c6..cc02729fc0 100644 --- a/testsuite/tests/programs/maessen-hashtab/test.T +++ b/testsuite/tests/programs/maessen-hashtab/test.T @@ -1,6 +1,7 @@ test('maessen_hashtab', - [reqlib('QuickCheck'), + [extra_files(['Data/', 'HashTest.hs']), + reqlib('QuickCheck'), extra_clean(['HashTest.hi', 'HashTest.o', 'Data/HashTab.hi', 'Data/HashTab.o']), when(fast(), skip), diff --git a/testsuite/tests/programs/north_array/test.T b/testsuite/tests/programs/north_array/test.T index 986087b0f1..2b3d0a3e52 100644 --- a/testsuite/tests/programs/north_array/test.T +++ b/testsuite/tests/programs/north_array/test.T @@ -1,3 +1,4 @@ -test('north_array', [when(fast(), skip)], multimod_compile_and_run, +test('north_array', [extra_files(['Main.hs']), + 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 7f0282df97..8da5b4a990 100644 --- a/testsuite/tests/programs/okeefe_neural/test.T +++ b/testsuite/tests/programs/okeefe_neural/test.T @@ -10,5 +10,6 @@ def set_opts( name, opts ): opts.expect = 'fail' -test('okeefe_neural', [when(fast(), skip), set_opts], multimod_compile_and_run, +test('okeefe_neural', [extra_files(['Main.hs']), + 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 b8cdbadeec..f4451a1a04 100644 --- a/testsuite/tests/programs/record_upd/test.T +++ b/testsuite/tests/programs/record_upd/test.T @@ -1,2 +1,3 @@ -test('record_upd', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('record_upd', [extra_files(['Main.hs']), + 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 9b2fcf4fc9..4a559b0660 100644 --- a/testsuite/tests/programs/rittri/test.T +++ b/testsuite/tests/programs/rittri/test.T @@ -1,2 +1,3 @@ -test('rittri', [when(fast(), skip)], multimod_compile_and_run, ['Main', '']) +test('rittri', [extra_files(['Main.hs']), + 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 e2e9b209fc..83b32ea712 100644 --- a/testsuite/tests/programs/sanders_array/test.T +++ b/testsuite/tests/programs/sanders_array/test.T @@ -1,3 +1,4 @@ -test('sanders_array', [when(fast(), skip)], multimod_compile_and_run, +test('sanders_array', [extra_files(['Main.hs']), + 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 935ebbf259..906fe94ff6 100644 --- a/testsuite/tests/programs/seward-space-leak/test.T +++ b/testsuite/tests/programs/seward-space-leak/test.T @@ -1,2 +1,3 @@ -test('seward-space-leak', [when(fast(), skip)], multimod_compile_and_run, +test('seward-space-leak', [extra_files(['Main.lhs']), + 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 b210abde72..9d1c770780 100644 --- a/testsuite/tests/programs/strict_anns/test.T +++ b/testsuite/tests/programs/strict_anns/test.T @@ -1,3 +1,4 @@ -test('strict_anns', [when(fast(), skip)], multimod_compile_and_run, +test('strict_anns', [extra_files(['Main.hs']), + 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 3a38db7a9e..b957bd9d3b 100644 --- a/testsuite/tests/programs/thurston-modular-arith/test.T +++ b/testsuite/tests/programs/thurston-modular-arith/test.T @@ -1,3 +1,4 @@ # uses GHC-specific scoped type variables -test('thurston-modular-arith', [when(fast(), skip)], multimod_compile_and_run, +test('thurston-modular-arith', [extra_files(['Main.hs', 'TypeVal.hs']), + when(fast(), skip)], multimod_compile_and_run, ['Main', '']) |