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/concurrent | |
| 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/concurrent')
| -rw-r--r-- | testsuite/tests/concurrent/prog001/all.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/prog002/all.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/prog003/all.T | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T index f23cc8804a..1476b4ffef 100644 --- a/testsuite/tests/concurrent/prog001/all.T +++ b/testsuite/tests/concurrent/prog001/all.T @@ -12,5 +12,6 @@ # multiple cores, which is why it is only running the 'threaded2' way # right now. --SDM 1/4/2010 -test('concprog001', [when(fast(), skip), only_ways(['threaded2'])], +test('concprog001', [extra_files(['Arithmetic.hs', 'Converter.hs', 'Mult.hs', 'Stream.hs', 'Thread.hs', 'Trit.hs', 'Utilities.hs']), + when(fast(), skip), only_ways(['threaded2'])], multimod_compile_and_run, ['Mult', '']) diff --git a/testsuite/tests/concurrent/prog002/all.T b/testsuite/tests/concurrent/prog002/all.T index dc583b3bd2..8cf3d87f90 100644 --- a/testsuite/tests/concurrent/prog002/all.T +++ b/testsuite/tests/concurrent/prog002/all.T @@ -10,6 +10,7 @@ else: # hence -O0: test('concprog002', - [only_ways(['threaded2', 'threaded2_hT']), extra_ways(ways), exit_code(1), + [extra_files(['Event.hs', 'Scheduler.hs', 'Server.hs', 'Thread.hs']), + only_ways(['threaded2', 'threaded2_hT']), extra_ways(ways), exit_code(1), when(fast(), skip), reqlib('random')], multimod_compile_and_run, ['Server', '-O0']) diff --git a/testsuite/tests/concurrent/prog003/all.T b/testsuite/tests/concurrent/prog003/all.T index 2f7fe3bec8..31e1667f26 100644 --- a/testsuite/tests/concurrent/prog003/all.T +++ b/testsuite/tests/concurrent/prog003/all.T @@ -10,6 +10,7 @@ # occasionally, but at least the test is here for posterity. test('concprog003', - [when(fast(), skip), reqlib('random'), + [extra_files(['CASList.hs', 'Collection.hs', 'IOList.lhs', 'ImmList.hs', 'MVarListLockCoupling.hs', 'Main.lhs', 'RefInterface.hs', 'TestData.hs', 'TestDataParser.hs', 'TestRun.hs', 'test-8-3000-3000-2-1-4']), + when(fast(), skip), reqlib('random'), extra_run_opts('IMM -t test-8-3000-3000-2-1-4')], multimod_compile_and_run, ['Main', '']) |