From 3415bcaa0b1903b5e12dfaadb5b774718e406eab Mon Sep 17 00:00:00 2001 From: Reid Barton Date: Fri, 24 Feb 2017 21:14:50 -0500 Subject: tests: remove extra_files.py (#12223) The script I used is included as testsuite/driver/kill_extra_files.py, though at this point it is for mostly historical interest. Some of the tests in libraries/hpc relied on extra_files.py, so this commit includes an update to that submodule. One test in libraries/process also relies on extra_files.py, but we cannot update that submodule so easily, so for now we special-case it in the test driver. --- testsuite/tests/driver/dynamicToo/all.T | 3 ++- testsuite/tests/driver/dynamicToo/dynamicToo001/test.T | 3 ++- testsuite/tests/driver/dynamicToo/dynamicToo002/test.T | 3 ++- testsuite/tests/driver/dynamicToo/dynamicToo004/test.T | 3 ++- testsuite/tests/driver/dynamicToo/dynamicToo005/test.T | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'testsuite/tests/driver/dynamicToo') 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']) -- cgit v1.2.1