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/plugins/all.T | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'testsuite/tests/plugins') diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T index ea285dcf93..9e17eb42c8 100644 --- a/testsuite/tests/plugins/all.T +++ b/testsuite/tests/plugins/all.T @@ -1,52 +1,64 @@ setTestOpts(req_interp) test('plugins01', - [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01 TOP={top}')], + [extra_files(['simple-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01 TOP={top}')], run_command, ['$MAKE -s --no-print-directory plugins01']) test('plugins02', - [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins02 TOP={top}')], + [extra_files(['simple-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins02 TOP={top}')], compile_fail, ['-package-db simple-plugin/pkg.plugins02/local.package.conf -fplugin Simple.BadlyTypedPlugin -package simple-plugin ' + config.plugin_way_flags]) test('plugins03', - [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins03 TOP={top}')], + [extra_files(['simple-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins03 TOP={top}')], compile_fail, ['-package-db simple-plugin/pkg.plugins03/local.package.conf -fplugin Simple.NonExistentPlugin -package simple-plugin']) -test('plugins04', [], multimod_compile_fail, +test('plugins04', [extra_files(['HomePackagePlugin.hs'])], multimod_compile_fail, ['plugins04', '-package ghc -fplugin HomePackagePlugin']) -test('plugins05', [only_ways([config.ghc_plugin_way])], +test('plugins05', [extra_files(['HomePackagePlugin.hs']), + only_ways([config.ghc_plugin_way])], multimod_compile_and_run, ['plugins05', '-package ghc']) test('plugins06', - [unless(have_dynamic(), skip), only_ways([config.ghc_plugin_way])], + [extra_files(['LinkerTicklingPlugin.hs']), + unless(have_dynamic(), skip), only_ways([config.ghc_plugin_way])], multimod_compile_and_run, ['plugins06', '-package ghc']) test('plugins07', - [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.plugins07 TOP={top}')], + [extra_files(['rule-defining-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.plugins07 TOP={top}')], run_command, ['$MAKE -s --no-print-directory plugins07']) test('T10420', - [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T10420 TOP={top}')], + [extra_files(['rule-defining-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T10420 TOP={top}')], run_command, ['$MAKE -s --no-print-directory T10420']) test('T10294', - [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294 TOP={top}')], + [extra_files(['annotation-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294 TOP={top}')], run_command, ['$MAKE -s --no-print-directory T10294']) test('T10294a', - [pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294a TOP={top}')], + [extra_files(['annotation-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294a TOP={top}')], run_command, ['$MAKE -s --no-print-directory T10294a']) -test('frontend01', [unless(have_dynamic(), expect_broken(10301))], run_command, +test('frontend01', [extra_files(['FrontendPlugin.hs']), + unless(have_dynamic(), expect_broken(10301))], run_command, ['$MAKE -s --no-print-directory frontend01']) test('T11244', - [pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T11244 TOP={top}')], + [extra_files(['rule-defining-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T11244 TOP={top}')], run_command, ['$MAKE -s --no-print-directory T11244']) test('T12567a', - [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.T12567a TOP={top}')], + [extra_files(['T12567b.hs', 'simple-plugin/']), + pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.T12567a TOP={top}')], run_command, ['$MAKE -s --no-print-directory T12567a']) -- cgit v1.2.1