From 8fcf041159d06986b5a11a3eddd115b4c71a39d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Jan 2014 13:58:43 -0400
Subject: [PATCH] temporarily revert tasty-rerun support for this release

revert c340d9506c0fda82402d5a37a7289984a2b640ff

tasty-rerun is stuck in NEW in debian
---
 Makefile         | 5 +----
 Test.hs          | 5 ++---
 debian/changelog | 1 -
 debian/control   | 1 -
 git-annex.cabal  | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 08a3fa920c..facacfe2e7 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,6 @@ 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
@@ -83,7 +80,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 .tasty-rerun-log
+		git-union-merge
 	find . -name \*.o -exec rm {} \;
 	find . -name \*.hi -exec rm {} \;
 
diff --git a/Test.hs b/Test.hs
index 0d8e0e3ef8..73fd3c003e 100644
--- a/Test.hs
+++ b/Test.hs
@@ -13,7 +13,6 @@ 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)
@@ -107,7 +106,7 @@ main ps = do
 
 ingredients :: [Ingredient]
 ingredients =
-	[ rerunningTests [consoleTestReporter]
+	[ consoleTestReporter
 	, listingTests
 	]
 
@@ -1270,7 +1269,7 @@ withTestEnv forcedirect = withResource prepare release
   where
 	prepare = do
 		env <- prepareTestEnv forcedirect
-		case tryIngredients [consoleTestReporter] mempty (initTests env) of
+		case tryIngredients ingredients 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 894f92e429..6063aeeef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,6 @@ 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 966d1e0ba0..060fde22fb 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,6 @@ 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 2d47317392..de6b3d54ba 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, tasty-rerun,
+    Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck,
      optparse-applicative
     CPP-Options: -DWITH_TESTSUITE