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

diff --git a/Test.hs b/Test.hs
index 9a2444a6394d6b3f9469c39be8aa4e514ed2e304..d10ef8b4cffd397dac4899b7401c98347c8be9cc 100644 (file)
--- 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 f18af00ba1024ffc9b6ea0f8261f16293848012c..0a015d44152aedc360ba5edaecb92a34ea9906b6 100644 (file)
--- 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 6ef4435cd2dd93bd80216235dd928989cc03b452..106565969244b34a5298a453859e17857bd1dec4 100644 (file)
--- 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