diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index c841dbac8edd895c0881e51ce82f3b940f0f8a23..eba3103fb122b230798290689823663a54494ce9 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -491,7 +491,7 @@ test-suite unit-tests directory, filepath, integer-logarithms >= 1.0.2 && <1.1, - tasty, + tasty >= 1.0 && < 1.1, tasty-hunit, tasty-quickcheck, tagged, @@ -511,7 +511,7 @@ test-suite parser-tests base-compat >=0.9.3 && <0.10, bytestring, filepath, - tasty, + tasty >= 1.0 && < 1.1, tasty-hunit, tasty-quickcheck, tasty-golden >=2.3.1.1 && <2.4, @@ -537,7 +537,7 @@ test-suite check-tests base, bytestring, filepath, - tasty, + tasty >= 1.0 && < 1.1, tasty-golden >=2.3.1.1 && <2.4, Diff >=0.3.4 && <0.4, Cabal diff --git a/appveyor.yml b/appveyor.yml index cf0e2083c98a12dedc3c9e47ede0be3415a68dfc..ab3e30a5c72797a41f8ac536387cb9617c8e3d4b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,7 +53,7 @@ build_script: - cd ..\cabal-testsuite - dist\build\cabal-tests\cabal-tests.exe -j3 --skip-setup-tests --with-cabal=..\cabal-install\dist\build\cabal\cabal.exe - cd ..\cabal-install - - ..\cabal test unit-tests --show-details=streaming --test-option=--pattern=!FileMonitor --test-option=--hide-successes + - ..\cabal test unit-tests --show-details=streaming --test-option="--pattern=! /FileMonitor/" --test-option=--hide-successes - ..\cabal test integration-tests2 --show-details=streaming --test-option=--hide-successes - ..\cabal test solver-quickcheck --show-details=streaming --test-option=--hide-successes --test-option=--quickcheck-tests=1000 - ..\cabal test memory-usage-tests --show-details=streaming diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 174c4327adf141f3bc2274bdc828074166fd1a6a..447905df1d3eeaac24aabd7f39cb9833d06f5e20 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -631,7 +631,7 @@ executable cabal random, tagged, tar, - tasty >= 0.12, + tasty >= 1.0 && < 1.1, tasty-hunit >= 0.10, tasty-quickcheck, time, @@ -691,8 +691,7 @@ Test-Suite unit-tests zlib, network-uri, network, - -- we need this upper bound for appveyor - tasty >= 0.12 && <1, + tasty >= 1.0 && < 1.1, tasty-hunit >= 0.10, tasty-quickcheck, tagged, @@ -724,7 +723,7 @@ Test-Suite memory-usage-tests containers, deepseq, tagged, - tasty >= 0.12, + tasty >= 1.0 && < 1.1, tasty-hunit >= 0.10 ghc-options: -threaded @@ -754,7 +753,7 @@ Test-Suite solver-quickcheck hashable, random, tagged, - tasty >= 0.12, + tasty >= 1.0 && <1.1, tasty-quickcheck, QuickCheck >= 2.8.2, pretty-show >= 1.6.15 @@ -783,7 +782,7 @@ test-suite integration-tests2 directory, edit-distance, filepath, - tasty >= 0.12, + tasty >= 1.0 && < 1.1, tasty-hunit >= 0.10, tagged diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index 8ddc70f0615b1a3a7a94fbe9f19e4e72ac9640b8..a276e96e95e8dcf4680c2178cd38fb17f1692f84 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -39,7 +39,7 @@ library base, bytestring, transformers, - optparse-applicative >=0.13 && <0.15, + optparse-applicative >=0.14 && <0.15, process, directory, filepath,