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/quasiquotation | |
| 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/quasiquotation')
| -rw-r--r-- | testsuite/tests/quasiquotation/T4491/test.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/quasiquotation/qq005/test.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/quasiquotation/qq006/test.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/quasiquotation/qq007/test.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/quasiquotation/qq008/test.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/quasiquotation/qq009/test.T | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/tests/quasiquotation/T4491/test.T b/testsuite/tests/quasiquotation/T4491/test.T index 01e7b1f3ec..2ef6b89edc 100644 --- a/testsuite/tests/quasiquotation/T4491/test.T +++ b/testsuite/tests/quasiquotation/T4491/test.T @@ -1,5 +1,6 @@ test('T4491', - [ + [extra_files(['A.hs']), + req_interp, # We'd need to jump through some hoops to run this test the # other ways, due to the TH use, so for now we only run it diff --git a/testsuite/tests/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T index 9c4ac5c5e6..333981a5d4 100644 --- a/testsuite/tests/quasiquotation/qq005/test.T +++ b/testsuite/tests/quasiquotation/qq005/test.T @@ -1,5 +1,6 @@ test('qq005', - [when(fast(), skip), + [extra_files(['Expr.hs', 'Main.hs']), + when(fast(), skip), reqlib('parsec'), # We'd need to jump through some hoops to run this test the # profiling ways, due to the TH use, so for now we just diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T index e9beadda64..e6c4b7c40a 100644 --- a/testsuite/tests/quasiquotation/qq006/test.T +++ b/testsuite/tests/quasiquotation/qq006/test.T @@ -1,2 +1,3 @@ -test('qq006', [when(fast(), skip), reqlib('parsec')], multimod_compile_fail, +test('qq006', [extra_files(['Expr.hs', 'Main.hs']), + when(fast(), skip), reqlib('parsec')], multimod_compile_fail, ['Main', '-v0']) diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T index 3a2524b771..edb3554190 100644 --- a/testsuite/tests/quasiquotation/qq007/test.T +++ b/testsuite/tests/quasiquotation/qq007/test.T @@ -1,4 +1,5 @@ test('qq007', - [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), + [extra_files(['QQ.hs', 'Test.hs']), + when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), omit_ways(prof_ways)], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T index f0827aa4f0..9d83f34907 100644 --- a/testsuite/tests/quasiquotation/qq008/test.T +++ b/testsuite/tests/quasiquotation/qq008/test.T @@ -1,4 +1,5 @@ test('qq008', - [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), + [extra_files(['QQ.hs', 'Test.hs']), + when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), omit_ways(prof_ways)], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) diff --git a/testsuite/tests/quasiquotation/qq009/test.T b/testsuite/tests/quasiquotation/qq009/test.T index 9b355de096..1f108a626e 100644 --- a/testsuite/tests/quasiquotation/qq009/test.T +++ b/testsuite/tests/quasiquotation/qq009/test.T @@ -1,4 +1,5 @@ test('qq009', - [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), + [extra_files(['QQ.hs', 'Test.hs']), + when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), omit_ways(prof_ways)], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) |