summaryrefslogtreecommitdiff
path: root/testsuite/tests/cabal
diff options
context:
space:
mode:
authorReid Barton <rwbarton@gmail.com>2017-02-24 20:56:19 -0500
committerBen Gamari <ben@smart-cactus.org>2017-02-26 17:30:44 -0500
commit98119f5a5224d321a1765f262c8c76dfd1b8ed35 (patch)
tree2ab3db7664a092bfbf6af82a26fb50799695f7d7 /testsuite/tests/cabal
parent8bb63c2e982a12ad5f436320948e23a718069a4f (diff)
downloadhaskell-98119f5a5224d321a1765f262c8c76dfd1b8ed35.tar.gz
tests: manually move some extra_files into *.T files
Some of the *.T files were in libraries/hpc, so this contains an update to that submodule.
Diffstat (limited to 'testsuite/tests/cabal')
-rw-r--r--testsuite/tests/cabal/cabal01/all.T3
-rw-r--r--testsuite/tests/cabal/sigcabal01/all.T2
2 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/tests/cabal/cabal01/all.T b/testsuite/tests/cabal/cabal01/all.T
index 43485ead3d..8da74f5eed 100644
--- a/testsuite/tests/cabal/cabal01/all.T
+++ b/testsuite/tests/cabal/cabal01/all.T
@@ -22,6 +22,7 @@ def ignoreLdOutput(str):
return re.sub('Creating library file: dist.build.libHStest-1.0-ghc[0-9.]*.dll.a\n', '', str)
test('cabal01',
- normalise_errmsg_fun(ignoreLdOutput),
+ [extra_files(['A.hs', 'B/', 'MainA.hs', 'Setup.lhs', 'c_src/', 'hello.c', 'test.cabal']),
+ normalise_errmsg_fun(ignoreLdOutput)],
run_command,
['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])
diff --git a/testsuite/tests/cabal/sigcabal01/all.T b/testsuite/tests/cabal/sigcabal01/all.T
index 4a1bad9956..7f6df90619 100644
--- a/testsuite/tests/cabal/sigcabal01/all.T
+++ b/testsuite/tests/cabal/sigcabal01/all.T
@@ -4,6 +4,6 @@ else:
cleanup = 'CLEANUP=0'
test('sigcabal01',
- expect_broken(10622),
+ [extra_files(['Main.hs', 'Setup.hs', 'p/']), expect_broken(10622)],
run_command,
['$MAKE -s --no-print-directory sigcabal01 ' + cleanup])