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/ffi | |
| 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/ffi')
| -rw-r--r-- | testsuite/tests/ffi/should_fail/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/ffi/should_run/all.T | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/tests/ffi/should_fail/all.T b/testsuite/tests/ffi/should_fail/all.T index 543835a70e..9e067622b5 100644 --- a/testsuite/tests/ffi/should_fail/all.T +++ b/testsuite/tests/ffi/should_fail/all.T @@ -6,7 +6,7 @@ test('ccfail001', normal, compile_fail, ['']) test('ccfail002', normal, compile_fail, ['']) test('ccfail003', normal, compile_fail, ['']) test('T3066', normal, compile_fail, ['']) -test('ccfail004', [], multimod_compile_fail, ['ccfail004', '-v0']) +test('ccfail004', [extra_files(['Ccfail004A.hs'])], multimod_compile_fail, ['ccfail004', '-v0']) test('ccfail005', normal, compile_fail, ['']) test('ccall_value', normal, compile_fail, ['']) test('capi_value_function', normal, compile_fail, ['']) diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index 38f0288410..1bb58c5e49 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -85,7 +85,8 @@ test('ffi017', normal, compile_and_run, ['']) test('ffi018', [omit_ways(['ghci'])], compile_and_run, ['ffi018_c.c']) test('ffi018_ghci', - [only_ways(['ghci']), + [extra_files(['ffi018.h']), + only_ways(['ghci']), pre_cmd('$MAKE -s --no-print-directory ffi018_ghci_setup')], compile_and_run, ['ffi018_ghci_c.o']) @@ -155,10 +156,10 @@ test('T5594', [ omit_ways(['ghci']), # needs it. compile_and_run, ['T5594_c.c -no-hs-main']) -test('Capi_Ctype_001', [], run_command, +test('Capi_Ctype_001', [extra_files(['Capi_Ctype_A_001.hsc', 'capi_ctype_001.h', 'capi_ctype_001_c.c'])], run_command, ['$MAKE -s --no-print-directory Capi_Ctype_001']) -test('Capi_Ctype_002', [], run_command, +test('Capi_Ctype_002', [extra_files(['Capi_Ctype_A_002.hsc', 'capi_ctype_002_A.h', 'capi_ctype_002_B.h'])], run_command, ['$MAKE -s --no-print-directory Capi_Ctype_002']) test('ffi_parsing_001', [omit_ways(['ghci'])], compile_and_run, |