diff --git a/Test.hs b/Test.hs index 9a2444a639..d10ef8b4cf 100644 --- a/Test.hs +++ b/Test.hs @@ -339,12 +339,7 @@ repoTests note numparts = map mk $ sep ] where mk l = testGroup groupname (initTests : map adddep l) -#ifdef MIN_VERSION_tasty(1,2) 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 sep = sep' (replicate numparts []) sep' (p:ps) (l:ls) = sep' (ps++[l:p]) ls diff --git a/git-annex.cabal b/git-annex.cabal index f18af00ba1..0a015d4415 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -374,7 +374,7 @@ Executable git-annex attoparsec (>= 0.13.2.2), concurrent-output (>= 1.10), QuickCheck (>= 2.10.0), - tasty (>= 0.7), + tasty (>= 1.2), tasty-hunit, tasty-quickcheck, tasty-rerun, diff --git a/standalone/linux/stack-i386ancient.yaml b/standalone/linux/stack-i386ancient.yaml index 6ef4435cd2..1065659692 100644 --- a/standalone/linux/stack-i386ancient.yaml +++ b/standalone/linux/stack-i386ancient.yaml @@ -18,12 +18,15 @@ extra-deps: - IfElse-0.85 - aws-0.21.1 - bloomfilter-2.0.1.0 -- tasty-1.1.0.4 -- tasty-rerun-1.1.13 +- tasty-1.2 +- tasty-rerun-1.1.14 - torrent-10000.1.1 - sandi-0.5 - http-client-0.5.14 - 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: git-annex: true resolver: lts-12.14