relax enough i386ancient deps to allow new tasty
The new ansi-terminal was needed for test concurrency, and the new concurrent-output fixes several bugs. And it turns out this is all that's needed to use the new tasty. Sponsored-by: Kevin Mueller on Patreon
This commit is contained in:
parent
a33f1a0815
commit
8bbd683f31
3 changed files with 6 additions and 8 deletions
5
Test.hs
5
Test.hs
|
@ -339,12 +339,7 @@ repoTests note numparts = map mk $ sep
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
mk l = testGroup groupname (initTests : map adddep l)
|
mk l = testGroup groupname (initTests : map adddep l)
|
||||||
#ifdef MIN_VERSION_tasty(1,2)
|
|
||||||
adddep = Test.Tasty.after AllSucceed (groupname ++ ".Init Tests")
|
adddep = Test.Tasty.after AllSucceed (groupname ++ ".Init Tests")
|
||||||
#else
|
|
||||||
#warning tasty is too old to support limiting or rerunning tests
|
|
||||||
adddep = id
|
|
||||||
#endif
|
|
||||||
groupname = "Repo Tests " ++ note
|
groupname = "Repo Tests " ++ note
|
||||||
sep = sep' (replicate numparts [])
|
sep = sep' (replicate numparts [])
|
||||||
sep' (p:ps) (l:ls) = sep' (ps++[l:p]) ls
|
sep' (p:ps) (l:ls) = sep' (ps++[l:p]) ls
|
||||||
|
|
|
@ -374,7 +374,7 @@ Executable git-annex
|
||||||
attoparsec (>= 0.13.2.2),
|
attoparsec (>= 0.13.2.2),
|
||||||
concurrent-output (>= 1.10),
|
concurrent-output (>= 1.10),
|
||||||
QuickCheck (>= 2.10.0),
|
QuickCheck (>= 2.10.0),
|
||||||
tasty (>= 0.7),
|
tasty (>= 1.2),
|
||||||
tasty-hunit,
|
tasty-hunit,
|
||||||
tasty-quickcheck,
|
tasty-quickcheck,
|
||||||
tasty-rerun,
|
tasty-rerun,
|
||||||
|
|
|
@ -18,12 +18,15 @@ extra-deps:
|
||||||
- IfElse-0.85
|
- IfElse-0.85
|
||||||
- aws-0.21.1
|
- aws-0.21.1
|
||||||
- bloomfilter-2.0.1.0
|
- bloomfilter-2.0.1.0
|
||||||
- tasty-1.1.0.4
|
- tasty-1.2
|
||||||
- tasty-rerun-1.1.13
|
- tasty-rerun-1.1.14
|
||||||
- torrent-10000.1.1
|
- torrent-10000.1.1
|
||||||
- sandi-0.5
|
- sandi-0.5
|
||||||
- http-client-0.5.14
|
- http-client-0.5.14
|
||||||
- filepath-bytestring-1.4.2.1.6
|
- filepath-bytestring-1.4.2.1.6
|
||||||
|
- ansi-terminal-0.9.1
|
||||||
|
- ansi-wl-pprint-0.6.9
|
||||||
|
- concurrent-output-1.10.15
|
||||||
explicit-setup-deps:
|
explicit-setup-deps:
|
||||||
git-annex: true
|
git-annex: true
|
||||||
resolver: lts-12.14
|
resolver: lts-12.14
|
||||||
|
|
Loading…
Reference in a new issue