diff options
| author | Reid Barton <rwbarton@gmail.com> | 2017-02-24 21:14:50 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-02-26 17:30:48 -0500 |
| commit | 3415bcaa0b1903b5e12dfaadb5b774718e406eab (patch) | |
| tree | f87cea33d55f1b196069e213e413019d8e9c6c3a /testsuite/tests/annotations | |
| parent | 98119f5a5224d321a1765f262c8c76dfd1b8ed35 (diff) | |
| download | haskell-3415bcaa0b1903b5e12dfaadb5b774718e406eab.tar.gz | |
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.
Diffstat (limited to 'testsuite/tests/annotations')
| -rw-r--r-- | testsuite/tests/annotations/should_compile/th/all.T | 6 | ||||
| -rw-r--r-- | testsuite/tests/annotations/should_fail/all.T | 9 | ||||
| -rw-r--r-- | testsuite/tests/annotations/should_run/all.T | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/tests/annotations/should_compile/th/all.T b/testsuite/tests/annotations/should_compile/th/all.T index 9bcc899263..368959b906 100644 --- a/testsuite/tests/annotations/should_compile/th/all.T +++ b/testsuite/tests/annotations/should_compile/th/all.T @@ -4,9 +4,11 @@ # now, just disable the profiling ways. test('annth_make', - [req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)], + [extra_files(['AnnHelper.hs', 'TestModule.hs', 'TestModuleTH.hs', 'annth.hs']), + req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory annth_make']) test('annth_compunits', - [req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)], + [extra_files(['AnnHelper.hs', 'TestModule.hs', 'TestModuleTH.hs', 'annth.hs']), + req_interp, omit_ways(prof_ways), unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory annth_compunits']) diff --git a/testsuite/tests/annotations/should_fail/all.T b/testsuite/tests/annotations/should_fail/all.T index 872ab41d88..e15cd35322 100644 --- a/testsuite/tests/annotations/should_fail/all.T +++ b/testsuite/tests/annotations/should_fail/all.T @@ -2,9 +2,12 @@ test('annfail01', normal, compile_fail, ['']) test('annfail02', normal, compile_fail, ['']) test('annfail03', req_interp, compile_fail, ['']) -test('annfail04', [req_interp], multimod_compile_fail, ['annfail04', '-v0']) -test('annfail05', [req_interp], multimod_compile_fail, ['annfail05', '-v0']) -test('annfail06', [req_interp], multimod_compile_fail, ['annfail06', '-v0']) +test('annfail04', [extra_files(['Annfail04_Help.hs']), + req_interp], multimod_compile_fail, ['annfail04', '-v0']) +test('annfail05', [extra_files(['Annfail05_Help.hs']), + req_interp], multimod_compile_fail, ['annfail05', '-v0']) +test('annfail06', [extra_files(['Annfail06_Help.hs']), + req_interp], multimod_compile_fail, ['annfail06', '-v0']) test('annfail07', req_interp, compile_fail, ['']) test('annfail08', req_interp, compile_fail, ['']) test('annfail09', req_interp, compile_fail, ['']) diff --git a/testsuite/tests/annotations/should_run/all.T b/testsuite/tests/annotations/should_run/all.T index cba34c5559..0c2acc7f63 100644 --- a/testsuite/tests/annotations/should_run/all.T +++ b/testsuite/tests/annotations/should_run/all.T @@ -7,7 +7,8 @@ setTestOpts(when(fast(), skip)) # now, just disable the profiling and dynamic ways, and use # config.ghc_th_way_flags. test('annrun01', - [pre_cmd('$MAKE -s --no-print-directory config'), + [extra_files(['Annrun01_Help.hs']), + pre_cmd('$MAKE -s --no-print-directory config'), omit_ways(['dyn'] + prof_ways)], multimod_compile_and_run, ['annrun01', '-package ghc ' + config.ghc_th_way_flags]) |