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 /libraries/base/tests | |
| 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 'libraries/base/tests')
| -rw-r--r-- | libraries/base/tests/IO/all.T | 4 | ||||
| -rw-r--r-- | libraries/base/tests/all.T | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index 5dab48f95d..0de530bc2c 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -88,7 +88,7 @@ test('hDuplicateTo001', [], compile_and_run, ['']) test('countReaders001', [], compile_and_run, ['']) test('concio001', normal, run_command, ['$MAKE -s --no-print-directory test.concio001']) -test('concio001.thr', normal, run_command, ['$MAKE -s --no-print-directory test.concio001.thr']) +test('concio001.thr', extra_files(['concio001.hs']), run_command, ['$MAKE -s --no-print-directory test.concio001.thr']) test('concio002', reqlib('process'), compile_and_run, ['']) @@ -112,7 +112,7 @@ test('encoding001', [], compile_and_run, ['']) test('encoding002', normal, compile_and_run, ['']) test('encoding003', normal, compile_and_run, ['']) -test('encoding004', normal, compile_and_run, ['']) +test('encoding004', extra_files(['encoded-data/']), compile_and_run, ['']) test('encoding005', normal, compile_and_run, ['']) test('environment001', [], run_command, diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 7125b636f8..13049f751c 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -79,9 +79,12 @@ test('dynamic004', omit_ways(['normal', 'threaded1', 'ghci']), compile_and_ test('dynamic005', normal, compile_and_run, ['']) enum_setups = [when(fast(), skip)] -test('enum01', enum_setups, compile_and_run, ['']) -test('enum02', enum_setups, compile_and_run, ['']) -test('enum03', enum_setups, compile_and_run, ['']) +test('enum01', [extra_files(['enum_processor.bat', 'enum_processor.py']), + enum_setups], compile_and_run, ['']) +test('enum02', [extra_files(['enum_processor.bat', 'enum_processor.py']), + enum_setups], compile_and_run, ['']) +test('enum03', [extra_files(['enum_processor.bat', 'enum_processor.py']), + enum_setups], compile_and_run, ['']) test('enum04', normal, compile_and_run, ['']) test('exceptionsrun001', normal, compile_and_run, ['']) @@ -92,10 +95,12 @@ test('list002', when(fast(), skip), compile_and_run, ['']) test('list003', when(fast(), skip), compile_and_run, ['']) test('isSuffixOf', normal, compile_and_run, ['']) -test('memo001', [extra_run_opts('+RTS -A10k -RTS')], multimod_compile_and_run, +test('memo001', [extra_files(['Memo1.lhs']), + extra_run_opts('+RTS -A10k -RTS')], multimod_compile_and_run, ['memo001', '']) -test('memo002', [extra_run_opts('20')], multimod_compile_and_run, +test('memo002', [extra_files(['Memo2.lhs']), + extra_run_opts('20')], multimod_compile_and_run, ['memo002', '']) test('stableptr001', |