mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temporarily revert tasty-rerun support for this release

Browse source 
revert c340d9506c

tasty-rerun is stuck in NEW in debian
This commit is contained in:
Joey Hess 2014-01-27 13:58:43 -04:00
parent e0224f01c1
commit 8fcf041159
5 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -54,9 +54,6 @@ install: build install-docs Build/InstallDesktopFile
test: git-annex test: git-annex
./git-annex test ./git-annex test
retest: git-annex
./git-annex test --rerun-update --rerun-filter failures
# hothasktags chokes on some template haskell etc, so ignore errors # hothasktags chokes on some template haskell etc, so ignore errors
tags: tags:
find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null
@ -83,7 +80,7 @@ clean:
doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \ doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \
Setup Build/InstallDesktopFile Build/EvilSplicer \ Setup Build/InstallDesktopFile Build/EvilSplicer \
Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs Build/DistributionUpdate \ Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs Build/DistributionUpdate \
git-union-merge .tasty-rerun-log git-union-merge
find . -name \*.o -exec rm {} \; find . -name \*.o -exec rm {} \;
find . -name \*.hi -exec rm {} \; find . -name \*.hi -exec rm {} \;

5
Test.hs
View file

@ -13,7 +13,6 @@ import Test.Tasty
import Test.Tasty.Runners import Test.Tasty.Runners
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Test.Tasty.QuickCheck import Test.Tasty.QuickCheck
import Test.Tasty.Ingredients.Rerun
import Data.Monoid import Data.Monoid
import Options.Applicative hiding (command) import Options.Applicative hiding (command)
@ -107,7 +106,7 @@ main ps = do
ingredients :: [Ingredient] ingredients :: [Ingredient]
ingredients = ingredients =
[ rerunningTests [consoleTestReporter] [ consoleTestReporter
, listingTests , listingTests
] ]
@ -1270,7 +1269,7 @@ withTestEnv forcedirect = withResource prepare release
where where
prepare = do prepare = do
env <- prepareTestEnv forcedirect env <- prepareTestEnv forcedirect
case tryIngredients [consoleTestReporter] mempty (initTests env) of case tryIngredients ingredients mempty (initTests env) of
Nothing -> error "No tests found!?" Nothing -> error "No tests found!?"
Just act -> unlessM act $ Just act -> unlessM act $
error "init tests failed! cannot continue" error "init tests failed! cannot continue"

1
debian/changelog vendored
View file

@ -30,7 +30,6 @@ git-annex (5.20140127) unstable; urgency=medium
* repair: Check git version at run time. * repair: Check git version at run time.
* assistant: Run the periodic git gc in batch mode. * assistant: Run the periodic git gc in batch mode.
* added annex.secure-erase-command config option. * 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 * 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 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 set to false, which is done when initially probing the uuid of a

1
debian/control vendored
View file

@ -54,7 +54,6 @@ Build-Depends:
libghc-tasty-dev (>= 0.7) [!mipsel !sparc], libghc-tasty-dev (>= 0.7) [!mipsel !sparc],
libghc-tasty-hunit-dev [!mipsel !sparc], libghc-tasty-hunit-dev [!mipsel !sparc],
libghc-tasty-quickcheck-dev [!mipsel !sparc], libghc-tasty-quickcheck-dev [!mipsel !sparc],
libghc-tasty-rerun-dev [!mipsel !sparc],
libghc-optparse-applicative-dev, libghc-optparse-applicative-dev,
lsof [!kfreebsd-i386 !kfreebsd-amd64], lsof [!kfreebsd-i386 !kfreebsd-amd64],
ikiwiki, ikiwiki,

2
git-annex.cabal
View file

@ -114,7 +114,7 @@ Executable git-annex
CPP-Options: -DWITH_CLIBS CPP-Options: -DWITH_CLIBS
if flag(TestSuite) if flag(TestSuite)
Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck,
optparse-applicative optparse-applicative
CPP-Options: -DWITH_TESTSUITE CPP-Options: -DWITH_TESTSUITE