diff options
Diffstat (limited to 'testsuite/tests/driver')
36 files changed, 104 insertions, 83 deletions
diff --git a/testsuite/tests/driver/T12062/all.T b/testsuite/tests/driver/T12062/all.T index 13147df45f..6d92b0fb82 100644 --- a/testsuite/tests/driver/T12062/all.T +++ b/testsuite/tests/driver/T12062/all.T @@ -1 +1 @@ -test('T12062', [], multimod_compile_fail, ['T12062', '-v0 -j0']) +test('T12062', [extra_files(['A.hs', 'A.hs-boot', 'C.hs'])], multimod_compile_fail, ['T12062', '-v0 -j0']) diff --git a/testsuite/tests/driver/T1372/all.T b/testsuite/tests/driver/T1372/all.T index ad269cec86..9414ce70dd 100644 --- a/testsuite/tests/driver/T1372/all.T +++ b/testsuite/tests/driver/T1372/all.T @@ -1 +1 @@ -test('T1372', [], run_command, ['$MAKE -s --no-print-directory T1372']) +test('T1372', [extra_files(['p1/', 'p2/'])], run_command, ['$MAKE -s --no-print-directory T1372']) diff --git a/testsuite/tests/driver/T1959/test.T b/testsuite/tests/driver/T1959/test.T index 8ace579066..e8eb3756d7 100644 --- a/testsuite/tests/driver/T1959/test.T +++ b/testsuite/tests/driver/T1959/test.T @@ -1 +1 @@ -test('T1959', [], run_command, ['$MAKE -s --no-print-directory dotest']) +test('T1959', [extra_files(['B.hs', 'C.hs', 'D.hs', 'E1.hs', 'E2.hs'])], run_command, ['$MAKE -s --no-print-directory dotest']) diff --git a/testsuite/tests/driver/T3007/all.T b/testsuite/tests/driver/T3007/all.T index db5b52bc67..bd9046cdd8 100644 --- a/testsuite/tests/driver/T3007/all.T +++ b/testsuite/tests/driver/T3007/all.T @@ -1 +1 @@ -test('T3007', [], run_command, ['$MAKE -s --no-print-directory T3007']) +test('T3007', [extra_files(['A/', 'B/'])], run_command, ['$MAKE -s --no-print-directory T3007']) diff --git a/testsuite/tests/driver/T437/all.T b/testsuite/tests/driver/T437/all.T index ff69c47899..a679ce2611 100644 --- a/testsuite/tests/driver/T437/all.T +++ b/testsuite/tests/driver/T437/all.T @@ -1,3 +1,3 @@ # Test for #437, a recompilation bug with '-main-is' -test('T437', [], run_command, ['$MAKE -s --no-print-directory T437']) +test('T437', [extra_files(['Test.hs', 'Test2.hs'])], run_command, ['$MAKE -s --no-print-directory T437']) diff --git a/testsuite/tests/driver/T5147/all.T b/testsuite/tests/driver/T5147/all.T index 5670cc505b..a83a005f1f 100644 --- a/testsuite/tests/driver/T5147/all.T +++ b/testsuite/tests/driver/T5147/all.T @@ -1 +1 @@ -test('T5147', [], run_command, ['$MAKE -s --no-print-directory T5147']) +test('T5147', [extra_files(['A.hs', 'B1.hs', 'B2.hs'])], run_command, ['$MAKE -s --no-print-directory T5147']) diff --git a/testsuite/tests/driver/T7373/all.T b/testsuite/tests/driver/T7373/all.T index a03bfcc51c..d7926afce5 100644 --- a/testsuite/tests/driver/T7373/all.T +++ b/testsuite/tests/driver/T7373/all.T @@ -1,2 +1,3 @@ -test('T7373', [expect_broken(7373)], run_command, +test('T7373', [extra_files(['D.hs', 'pkg/']), + expect_broken(7373)], run_command, ['$MAKE -s --no-print-directory T7373']) diff --git a/testsuite/tests/driver/T7835/all.T b/testsuite/tests/driver/T7835/all.T index d28ddcc95a..a5a09e6920 100644 --- a/testsuite/tests/driver/T7835/all.T +++ b/testsuite/tests/driver/T7835/all.T @@ -1,2 +1,2 @@ -test('T7835', [], run_command, ['$MAKE -s --no-print-directory T7835']) +test('T7835', [extra_files(['Test.hs', 'TestPrim.hs', 'test-prims.cmm'])], run_command, ['$MAKE -s --no-print-directory T7835']) diff --git a/testsuite/tests/driver/T8184/all.T b/testsuite/tests/driver/T8184/all.T index ec859bfc7c..e2cc32afc0 100644 --- a/testsuite/tests/driver/T8184/all.T +++ b/testsuite/tests/driver/T8184/all.T @@ -1,2 +1,2 @@ -test('T8184', normal, run_command, +test('T8184', extra_files(['A.hs', 'B.hs', 'B.hs-boot', 'C.hs']), run_command, ['$MAKE -s --no-print-directory T8184']) diff --git a/testsuite/tests/driver/T8526/T8526.T b/testsuite/tests/driver/T8526/T8526.T index e5da9a3182..e6885c791c 100644 --- a/testsuite/tests/driver/T8526/T8526.T +++ b/testsuite/tests/driver/T8526/T8526.T @@ -1 +1 @@ -test('T8526', [], ghci_script, ['T8526.script']) +test('T8526', [extra_files(['A.hs'])], ghci_script, ['T8526.script']) diff --git a/testsuite/tests/driver/T8602/T8602.T b/testsuite/tests/driver/T8602/T8602.T index 22a63e2fd8..007b8ddc42 100644 --- a/testsuite/tests/driver/T8602/T8602.T +++ b/testsuite/tests/driver/T8602/T8602.T @@ -1,5 +1,6 @@ test('T8602', - [extra_clean(['t8602.sh']), + [extra_files(['A.hs']), + extra_clean(['t8602.sh']), # Windows runs the preprocessor using runInteractiveProcess and can't # properly run the generated shell script as a result, since it can't # recognize e.g. a shebang or anything. diff --git a/testsuite/tests/driver/T9562/all.T b/testsuite/tests/driver/T9562/all.T index 90110c256a..caa0c31f25 100644 --- a/testsuite/tests/driver/T9562/all.T +++ b/testsuite/tests/driver/T9562/all.T @@ -1,2 +1,3 @@ -test('T9562', [expect_broken(9562)], run_command, +test('T9562', [extra_files(['A.hs', 'B.hs', 'B.hs-boot', 'C.hs', 'D.hs', 'Main.hs']), + expect_broken(9562)], run_command, ['$MAKE -s --no-print-directory T9562']) diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index e03d4dfdc2..09dc79ab79 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -1,73 +1,73 @@ -test('driver011', [], run_command, ['$MAKE -s --no-print-directory test011']) +test('driver011', [extra_files(['A011.hs'])], run_command, ['$MAKE -s --no-print-directory test011']) -test('driver012', [], run_command, ['$MAKE -s --no-print-directory test012']) +test('driver012', [extra_files(['A012.hs'])], run_command, ['$MAKE -s --no-print-directory test012']) -test('driver013', [], run_command, ['$MAKE -s --no-print-directory test013']) +test('driver013', [extra_files(['A013.hs'])], run_command, ['$MAKE -s --no-print-directory test013']) -test('driver014', [], run_command, ['$MAKE -s --no-print-directory test014']) +test('driver014', [extra_files(['A014.hs'])], run_command, ['$MAKE -s --no-print-directory test014']) -test('driver015', [], run_command, ['$MAKE -s --no-print-directory test015']) +test('driver015', [extra_files(['A015.hs'])], run_command, ['$MAKE -s --no-print-directory test015']) -test('driver016', [], run_command, ['$MAKE -s --no-print-directory test016']) +test('driver016', [extra_files(['F016.hs'])], run_command, ['$MAKE -s --no-print-directory test016']) -test('driver017', [], run_command, ['$MAKE -s --no-print-directory test017']) +test('driver017', [extra_files(['F017.hs'])], run_command, ['$MAKE -s --no-print-directory test017']) -test('driver018', [], run_command, ['$MAKE -s --no-print-directory test018']) +test('driver018', [extra_files(['F018.hs'])], run_command, ['$MAKE -s --no-print-directory test018']) -test('driver018a', [], run_command, ['$MAKE -s --no-print-directory test018a']) +test('driver018a', [extra_files(['F018a.hs'])], run_command, ['$MAKE -s --no-print-directory test018a']) -test('driver019', [], run_command, ['$MAKE -s --no-print-directory test019']) +test('driver019', [extra_files(['F019.hs'])], run_command, ['$MAKE -s --no-print-directory test019']) -test('driver021', [], run_command, ['$MAKE -s --no-print-directory test021']) +test('driver021', [extra_files(['B021/'])], run_command, ['$MAKE -s --no-print-directory test021']) -test('driver022', [], run_command, ['$MAKE -s --no-print-directory test022']) +test('driver022', [extra_files(['B022/'])], run_command, ['$MAKE -s --no-print-directory test022']) -test('driver023', [], run_command, ['$MAKE -s --no-print-directory test023']) +test('driver023', [extra_files(['B023/'])], run_command, ['$MAKE -s --no-print-directory test023']) -test('driver024', [], run_command, ['$MAKE -s --no-print-directory test024']) +test('driver024', [extra_files(['B024/'])], run_command, ['$MAKE -s --no-print-directory test024']) test('driver024a', [], run_command, ['$MAKE -s --no-print-directory test024a']) -test('driver025', [], run_command, ['$MAKE -s --no-print-directory test025']) +test('driver025', [extra_files(['B025/'])], run_command, ['$MAKE -s --no-print-directory test025']) -test('driver026', [], run_command, ['$MAKE -s --no-print-directory test026']) +test('driver026', [extra_files(['d026/'])], run_command, ['$MAKE -s --no-print-directory test026']) -test('driver027', [], run_command, ['$MAKE -s --no-print-directory test027']) +test('driver027', [extra_files(['B027/'])], run_command, ['$MAKE -s --no-print-directory test027']) -test('driver028', [], run_command, ['$MAKE -s --no-print-directory test028']) +test('driver028', [extra_files(['B028/'])], run_command, ['$MAKE -s --no-print-directory test028']) -test('driver031', [], run_command, ['$MAKE -s --no-print-directory test031']) +test('driver031', [extra_files(['A031.hs'])], run_command, ['$MAKE -s --no-print-directory test031']) -test('driver032', [], run_command, ['$MAKE -s --no-print-directory test032']) +test('driver032', [extra_files(['A032.hs'])], run_command, ['$MAKE -s --no-print-directory test032']) -test('driver033', [], run_command, ['$MAKE -s --no-print-directory test033']) +test('driver033', [extra_files(['A033.hs'])], run_command, ['$MAKE -s --no-print-directory test033']) -test('driver034', [], run_command, ['$MAKE -s --no-print-directory test034']) +test('driver034', [extra_files(['F034.hs'])], run_command, ['$MAKE -s --no-print-directory test034']) -test('driver035', [], run_command, ['$MAKE -s --no-print-directory test035']) +test('driver035', [extra_files(['F035.hs'])], run_command, ['$MAKE -s --no-print-directory test035']) -test('driver041', [], run_command, ['$MAKE -s --no-print-directory test041']) +test('driver041', [extra_files(['B041/'])], run_command, ['$MAKE -s --no-print-directory test041']) -test('driver042', [], run_command, ['$MAKE -s --no-print-directory test042']) +test('driver042', [extra_files(['B042/'])], run_command, ['$MAKE -s --no-print-directory test042']) -test('driver042stub', [], run_command, +test('driver042stub', [extra_files(['B042stub/'])], run_command, ['$MAKE -s --no-print-directory test042stub']) -test('driver043', [], run_command, ['$MAKE -s --no-print-directory test043']) +test('driver043', [extra_files(['B043/'])], run_command, ['$MAKE -s --no-print-directory test043']) -test('driver044', [], run_command, ['$MAKE -s --no-print-directory test044']) +test('driver044', [extra_files(['B044/'])], run_command, ['$MAKE -s --no-print-directory test044']) -test('driver045', [], run_command, ['$MAKE -s --no-print-directory test045']) +test('driver045', [extra_files(['B045/'])], run_command, ['$MAKE -s --no-print-directory test045']) -test('driver051', [], run_command, ['$MAKE -s --no-print-directory test051']) +test('driver051', [extra_files(['d051_1/', 'd051_2/'])], run_command, ['$MAKE -s --no-print-directory test051']) -test('driver052', [], run_command, ['$MAKE -s --no-print-directory test052']) +test('driver052', [extra_files(['d052_1/', 'd052_2/'])], run_command, ['$MAKE -s --no-print-directory test052']) -test('driver053', [], run_command, ['$MAKE -s --no-print-directory test053']) +test('driver053', [extra_files(['d053_1/', 'd053_2/'])], run_command, ['$MAKE -s --no-print-directory test053']) -test('driver061a', [], run_command, ['$MAKE -s --no-print-directory test061a']) +test('driver061a', [extra_files(['A061a.hs'])], run_command, ['$MAKE -s --no-print-directory test061a']) -test('driver061b', [], run_command, ['$MAKE -s --no-print-directory test061b']) +test('driver061b', [extra_files(['A061b.hs'])], run_command, ['$MAKE -s --no-print-directory test061b']) test('driver062a', [], run_command, ['$MAKE -s --no-print-directory test062a']) @@ -76,27 +76,27 @@ test('driver062c', [], run_command, ['$MAKE -s --no-print-directory test062c']) test('driver062d', [], run_command, ['$MAKE -s --no-print-directory test062d']) test('driver062e', [], run_command, ['$MAKE -s --no-print-directory test062e']) -test('driver063', [], run_command, ['$MAKE -s --no-print-directory test063']) +test('driver063', [extra_files(['D063.hs'])], run_command, ['$MAKE -s --no-print-directory test063']) -test('driver064', [], run_command, ['$MAKE -s --no-print-directory test064']) +test('driver064', [extra_files(['A064.hs'])], run_command, ['$MAKE -s --no-print-directory test064']) -test('driver065', [], run_command, ['$MAKE -s --no-print-directory test065']) +test('driver065', [extra_files(['A065.hs'])], run_command, ['$MAKE -s --no-print-directory test065']) -test('driver066', [], run_command, ['$MAKE -s --no-print-directory test066']) +test('driver066', [extra_files(['A066.hs'])], run_command, ['$MAKE -s --no-print-directory test066']) -test('driver067', [], run_command, ['$MAKE -s --no-print-directory test067']) +test('driver067', [extra_files(['A067.hs'])], run_command, ['$MAKE -s --no-print-directory test067']) -test('driver070', [], run_command, ['$MAKE -s --no-print-directory test070']) +test('driver070', [extra_files(['A070.hs'])], run_command, ['$MAKE -s --no-print-directory test070']) -test('driver071', [], run_command, ['$MAKE -s --no-print-directory test071']) +test('driver071', [extra_files(['A071.hs'])], run_command, ['$MAKE -s --no-print-directory test071']) test('driver081a', [], run_command, ['$MAKE -s --no-print-directory test081a']) test('driver081b', [], run_command, ['$MAKE -s --no-print-directory test081b']) -test('driver100', [], run_command, ['$MAKE -s --no-print-directory test100']) +test('driver100', [extra_files(['overlap/'])], run_command, ['$MAKE -s --no-print-directory test100']) -test('driver200', [], run_command, ['$MAKE -s --no-print-directory test200']) +test('driver200', [extra_files(['A200.hs', 'B200/', 'D200.hs'])], run_command, ['$MAKE -s --no-print-directory test200']) test('T2566', normalise_fun(normalise_errmsg), @@ -116,7 +116,8 @@ if config.os == 'mingw32': else: only_windows = skip -test('shared001', [only_windows], run_command, +test('shared001', [extra_files(['Shared001.hs']), + only_windows], run_command, ['$MAKE -s --no-print-directory shared001']) if config.os == 'darwin': @@ -124,7 +125,8 @@ if config.os == 'darwin': else: only_darwin = skip -test('static001', [only_darwin, expect_broken(8127)], run_command, +test('static001', [extra_files(['Static001.hs']), + only_darwin, expect_broken(8127)], run_command, ['$MAKE -s --no-print-directory static001']) test('dynHelloWorld', @@ -141,7 +143,7 @@ test('T5313', test('T2464', normal, compile, ['']) test('T3674', [], run_command, ['$MAKE -s --no-print-directory T3674']) -test('rtsopts001', [], run_command, +test('rtsopts001', [extra_files(['rtsOpts.hs'])], run_command, ['$MAKE -s --no-print-directory rtsopts001']) test('rtsopts002', normal, run_command, ['$MAKE -s --no-print-directory rtsopts002']) @@ -205,10 +207,10 @@ test('T8101b', expect_broken(10600), multimod_compile, # Should not panic when compiling cmm file together with -outputdir. test('T9050', cmm_src, compile, ['-outputdir=.']) -test('write_interface_oneshot', [], run_command, +test('write_interface_oneshot', [extra_files(['A011.hs'])], run_command, ['$MAKE -s --no-print-directory write_interface_oneshot']) -test('write_interface_make', [], run_command, +test('write_interface_make', [extra_files(['A011.hs'])], run_command, ['$MAKE -s --no-print-directory write_interface_make']) test('T9776', normal, compile_fail, ['-frule-check']) diff --git a/testsuite/tests/driver/bug1677/all.T b/testsuite/tests/driver/bug1677/all.T index d2bd077a4e..4d25fed713 100644 --- a/testsuite/tests/driver/bug1677/all.T +++ b/testsuite/tests/driver/bug1677/all.T @@ -1 +1 @@ -test('bug1677', normal, run_command, ['$MAKE bug1677 -s --no-print-directory']) +test('bug1677', extra_files(['Bar.hs', 'Foo.hs']), run_command, ['$MAKE bug1677 -s --no-print-directory']) diff --git a/testsuite/tests/driver/dynamicToo/all.T b/testsuite/tests/driver/dynamicToo/all.T index 5df706ec4c..c190c6bcfc 100644 --- a/testsuite/tests/driver/dynamicToo/all.T +++ b/testsuite/tests/driver/dynamicToo/all.T @@ -1,4 +1,5 @@ test('dynamicToo003', - [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, + [extra_files(['A003.hs']), + unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory dynamicToo003']) diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T index 7b5398b78d..0d3f81e2e9 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T @@ -1,5 +1,6 @@ test('dynamicToo001', - [when(opsys('mingw32'), expect_broken(7665)), unless(have_vanilla(), skip), + [extra_files(['A.hs', 'B.hs', 'B1.hs', 'B2.hs', 'C.hs']), + when(opsys('mingw32'), expect_broken(7665)), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory dynamicToo001']) diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T index 1e307eb9d4..fe94f3758f 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T @@ -1,4 +1,5 @@ test('dynamicToo002', - [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, + [extra_files(['A.hs', 'B.hs', 'C.hs']), + unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory dynamicToo002']) diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T index 30bedf0f94..72810baa8c 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T @@ -1,6 +1,7 @@ test('dynamicToo004', - [expect_broken(7665), + [extra_files(['Setup.hs', 'pkg1/', 'pkg1dyn/', 'pkg2/', 'prog.hs']), + expect_broken(7665), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T index 5a31c981b3..f062a21485 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T @@ -1,4 +1,5 @@ test('dynamicToo005', - [unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, + [extra_files(['dynamicToo005.bkp']), + unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory dynamicToo005']) diff --git a/testsuite/tests/driver/dynamic_flags_001/all.T b/testsuite/tests/driver/dynamic_flags_001/all.T index 29159741de..d019a667e3 100644 --- a/testsuite/tests/driver/dynamic_flags_001/all.T +++ b/testsuite/tests/driver/dynamic_flags_001/all.T @@ -1,2 +1,3 @@ -test('dynamic_flags_001', [when(fast(), skip)], run_command, +test('dynamic_flags_001', [extra_files(['A.hs', 'B.hs', 'C.hs']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory dynamic_flags_001']) diff --git a/testsuite/tests/driver/recomp001/all.T b/testsuite/tests/driver/recomp001/all.T index 9b133d8a8a..4c046da3e3 100644 --- a/testsuite/tests/driver/recomp001/all.T +++ b/testsuite/tests/driver/recomp001/all.T @@ -1,2 +1,3 @@ -test('recomp001', [when(fast(), skip)], run_command, +test('recomp001', [extra_files(['A.hs', 'B1.hs', 'B2.hs', 'C.hs']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory recomp001']) diff --git a/testsuite/tests/driver/recomp002/all.T b/testsuite/tests/driver/recomp002/all.T index c1fc00fc6a..d8a5ee7d1b 100644 --- a/testsuite/tests/driver/recomp002/all.T +++ b/testsuite/tests/driver/recomp002/all.T @@ -1,2 +1,3 @@ -test('recomp002', [when(fast(), skip)], run_command, +test('recomp002', [extra_files(['Q.hs', 'W.hs', 'W.hs-boot']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory recomp002']) diff --git a/testsuite/tests/driver/recomp003/all.T b/testsuite/tests/driver/recomp003/all.T index ddef73575b..0437626e31 100644 --- a/testsuite/tests/driver/recomp003/all.T +++ b/testsuite/tests/driver/recomp003/all.T @@ -1 +1 @@ -test('recomp003', [], run_command, ['$MAKE -s --no-print-directory recomp003']) +test('recomp003', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory recomp003']) diff --git a/testsuite/tests/driver/recomp004/all.T b/testsuite/tests/driver/recomp004/all.T index 787147b2fc..945d8a1543 100644 --- a/testsuite/tests/driver/recomp004/all.T +++ b/testsuite/tests/driver/recomp004/all.T @@ -1 +1 @@ -test('recomp004', [], run_command, ['$MAKE -s --no-print-directory recomp004']) +test('recomp004', [extra_files(['Main.hs', 'c.h', 'c1.c', 'c2.c'])], run_command, ['$MAKE -s --no-print-directory recomp004']) diff --git a/testsuite/tests/driver/recomp005/all.T b/testsuite/tests/driver/recomp005/all.T index 64ec8b0f4f..533b7d6c8d 100644 --- a/testsuite/tests/driver/recomp005/all.T +++ b/testsuite/tests/driver/recomp005/all.T @@ -1,2 +1,3 @@ -test('recomp005', [when(fast(), skip)], run_command, +test('recomp005', [extra_files(['A.hs', 'B.hs', 'C1.hs', 'C2.hs', 'D.hs', 'E.hs']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory recomp005']) diff --git a/testsuite/tests/driver/recomp006/all.T b/testsuite/tests/driver/recomp006/all.T index 44d33c03ce..c7252efd78 100644 --- a/testsuite/tests/driver/recomp006/all.T +++ b/testsuite/tests/driver/recomp006/all.T @@ -1,2 +1,3 @@ -test('recomp006', [when(fast(), skip)], run_command, +test('recomp006', [extra_files(['A.hs', 'B1.hs', 'B2.hs']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory recomp006']) diff --git a/testsuite/tests/driver/recomp007/all.T b/testsuite/tests/driver/recomp007/all.T index e123cbaba3..d4283ddedd 100644 --- a/testsuite/tests/driver/recomp007/all.T +++ b/testsuite/tests/driver/recomp007/all.T @@ -2,5 +2,6 @@ # See the patch # "Fix a recompilation checking bug when a package dependency changes" -test('recomp007', [when(fast(), skip), normalise_slashes], run_command, +test('recomp007', [extra_files(['Setup.hs', 'a1/', 'a2/', 'b/']), + when(fast(), skip), normalise_slashes], run_command, ['$MAKE -s --no-print-directory recomp007']) diff --git a/testsuite/tests/driver/recomp008/all.T b/testsuite/tests/driver/recomp008/all.T index aa147826bf..42f52cd090 100644 --- a/testsuite/tests/driver/recomp008/all.T +++ b/testsuite/tests/driver/recomp008/all.T @@ -1,4 +1,5 @@ # Test for #4469, a recompilation bug related to instances -test('recomp008', [when(fast(), skip), normalise_slashes], run_command, +test('recomp008', [extra_files(['A1.hs', 'A2.hs', 'B.hs', 'Main.hs']), + when(fast(), skip), normalise_slashes], run_command, ['$MAKE -s --no-print-directory recomp008']) diff --git a/testsuite/tests/driver/recomp009/all.T b/testsuite/tests/driver/recomp009/all.T index 519933ac81..2b5d2afaf3 100644 --- a/testsuite/tests/driver/recomp009/all.T +++ b/testsuite/tests/driver/recomp009/all.T @@ -1,3 +1,3 @@ # Test for #481, a recompilation bug with Template Haskell -test('recomp009', [], run_command, ['$MAKE -s --no-print-directory recomp009']) +test('recomp009', [extra_files(['Main.hs', 'Sub1.hs', 'Sub2.hs'])], run_command, ['$MAKE -s --no-print-directory recomp009']) diff --git a/testsuite/tests/driver/recomp010/all.T b/testsuite/tests/driver/recomp010/all.T index 1fd1e2a0fa..5eea6a10d0 100644 --- a/testsuite/tests/driver/recomp010/all.T +++ b/testsuite/tests/driver/recomp010/all.T @@ -1,3 +1,3 @@ # Test for #5614, a recompilation bug -test('recomp010', [], run_command, ['$MAKE -s --no-print-directory recomp010']) +test('recomp010', [extra_files(['Main.hs', 'X1.hs', 'X2.hs'])], run_command, ['$MAKE -s --no-print-directory recomp010']) diff --git a/testsuite/tests/driver/recomp011/all.T b/testsuite/tests/driver/recomp011/all.T index 1dd66b8027..c22a6951a2 100644 --- a/testsuite/tests/driver/recomp011/all.T +++ b/testsuite/tests/driver/recomp011/all.T @@ -1,5 +1,6 @@ # Test for #3589, recompiling when #included files change test('recomp011', - [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11260))], + [extra_files(['Main.hs']), + when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11260))], run_command, ['$MAKE -s --no-print-directory recomp011']) diff --git a/testsuite/tests/driver/recomp015/all.T b/testsuite/tests/driver/recomp015/all.T index fe29078b7c..e0b77f3cce 100644 --- a/testsuite/tests/driver/recomp015/all.T +++ b/testsuite/tests/driver/recomp015/all.T @@ -1,7 +1,8 @@ # Test for the ELF parser: more than 0xff00 sections (use different ELF fields) test('recomp015', - [ clean_cmd('$MAKE -s clean'), + [extra_files(['Generate.hs']), + clean_cmd('$MAKE -s clean'), # See ticket:11022#comment:7 unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip), when(arch('arm'), skip), diff --git a/testsuite/tests/driver/recomp016/all.T b/testsuite/tests/driver/recomp016/all.T index 45e2b4e8de..54b33723c0 100644 --- a/testsuite/tests/driver/recomp016/all.T +++ b/testsuite/tests/driver/recomp016/all.T @@ -1,3 +1,3 @@ # Test for #12723, a recompilation bug -test('recomp016', [], run_command, ['$MAKE -s --no-print-directory recomp016']) +test('recomp016', [extra_files(['A.hs', 'A2.hs', 'C.hs', 'D.hs', 'E.hs'])], run_command, ['$MAKE -s --no-print-directory recomp016']) diff --git a/testsuite/tests/driver/retc001/all.T b/testsuite/tests/driver/retc001/all.T index aa36d77dd6..3f15ed1654 100644 --- a/testsuite/tests/driver/retc001/all.T +++ b/testsuite/tests/driver/retc001/all.T @@ -1,5 +1,6 @@ test('retc001', - [clean_cmd('$MAKE -s clean'), + [extra_files(['A.hs', 'B1.hs', 'B2.hs', 'C.hs']), + clean_cmd('$MAKE -s clean'), # See issue 11204, this test sometimes passes and sometimes fails on OSX when(opsys('darwin'), skip)], run_command, diff --git a/testsuite/tests/driver/retc002/all.T b/testsuite/tests/driver/retc002/all.T index 54267f3865..a2b67e47b0 100644 --- a/testsuite/tests/driver/retc002/all.T +++ b/testsuite/tests/driver/retc002/all.T @@ -1,2 +1,3 @@ -test('retc002', [when(fast(), skip)], run_command, +test('retc002', [extra_files(['Q.hs', 'W.hs', 'W.hs-boot']), + when(fast(), skip)], run_command, ['$MAKE -s --no-print-directory retc002']) diff --git a/testsuite/tests/driver/retc003/all.T b/testsuite/tests/driver/retc003/all.T index 4d97b18f6a..0bfefce6b5 100644 --- a/testsuite/tests/driver/retc003/all.T +++ b/testsuite/tests/driver/retc003/all.T @@ -1 +1 @@ -test('retc003', [], run_command, ['$MAKE -s --no-print-directory retc003']) +test('retc003', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory retc003']) |