diff options
author | Joey Hess <joey@kitenet.net> | 2014-01-27 14:22:44 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-01-27 14:22:44 -0400 |
commit | b1eef1745c8fe5c2f8f2bf87573b1bd8eeb805df (patch) | |
tree | 33e89c16f09f055eca780e24ea39327acfc18b05 | |
parent | 74cefaddba9e4613b614b0d7a9613f12ba6f4ba8 (diff) |
Revert "temporarily revert tasty-rerun support for this release"
This reverts commit 65eb61a902ecf68da69d774063fea4880f619a13.
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | Test.hs | 5 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | git-annex.cabal | 2 |
5 files changed, 10 insertions, 4 deletions
@@ -54,6 +54,9 @@ install: build install-docs Build/InstallDesktopFile test: git-annex ./git-annex test +retest: git-annex + ./git-annex test --rerun-update --rerun-filter failures + # hothasktags chokes on some template haskell etc, so ignore errors tags: find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null @@ -80,7 +83,7 @@ clean: doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \ Setup Build/InstallDesktopFile Build/EvilSplicer \ Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs Build/DistributionUpdate \ - git-union-merge + git-union-merge .tasty-rerun-log find . -name \*.o -exec rm {} \; find . -name \*.hi -exec rm {} \; @@ -13,6 +13,7 @@ import Test.Tasty import Test.Tasty.Runners import Test.Tasty.HUnit import Test.Tasty.QuickCheck +import Test.Tasty.Ingredients.Rerun import Data.Monoid import Options.Applicative hiding (command) @@ -106,7 +107,7 @@ main ps = do ingredients :: [Ingredient] ingredients = - [ consoleTestReporter + [ rerunningTests [consoleTestReporter] , listingTests ] @@ -1269,7 +1270,7 @@ withTestEnv forcedirect = withResource prepare release where prepare = do env <- prepareTestEnv forcedirect - case tryIngredients ingredients mempty (initTests env) of + case tryIngredients [consoleTestReporter] mempty (initTests env) of Nothing -> error "No tests found!?" Just act -> unlessM act $ error "init tests failed! cannot continue" diff --git a/debian/changelog b/debian/changelog index 6063aeeef..894f92e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ git-annex (5.20140127) unstable; urgency=medium * repair: Check git version at run time. * assistant: Run the periodic git gc in batch mode. * added annex.secure-erase-command config option. + * test suite: Use tasty-rerun, and expose tasty command-line options. * Optimise non-bare http remotes; no longer does a 404 to the wrong url every time before trying the right url. Needs annex-bare to be set to false, which is done when initially probing the uuid of a diff --git a/debian/control b/debian/control index 060fde22f..966d1e0ba 100644 --- a/debian/control +++ b/debian/control @@ -54,6 +54,7 @@ Build-Depends: libghc-tasty-dev (>= 0.7) [!mipsel !sparc], libghc-tasty-hunit-dev [!mipsel !sparc], libghc-tasty-quickcheck-dev [!mipsel !sparc], + libghc-tasty-rerun-dev [!mipsel !sparc], libghc-optparse-applicative-dev, lsof [!kfreebsd-i386 !kfreebsd-amd64], ikiwiki, diff --git a/git-annex.cabal b/git-annex.cabal index de6b3d54b..2d4731739 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -114,7 +114,7 @@ Executable git-annex CPP-Options: -DWITH_CLIBS if flag(TestSuite) - Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, + Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, optparse-applicative CPP-Options: -DWITH_TESTSUITE |