Added quickcheck to build dependencies, and fail if test suite cannot be built.

Makefile

@@ -66,12 +66,11 @@ install: all
 
 test:
 	@if ! $(GHCMAKE) -O0 test; then \
-		echo "** not running test suite" >&2; \
-	else \
-		if ! ./test; then \
+		echo "** failed to build the test suite" >&2; \
+		exit 1; \
+	elif ! ./test; then \
 		echo "** test suite failed!" >&2; \
 		exit 1; \
-		fi; \
 	fi
 
 testcoverage:

debian/changelog

@@ -8,6 +8,8 @@ git-annex (3.20111232) UNRELEASED; urgency=low
     unless the dotfile or directory is explicitly listed. So "git annex add ."
     will add all untracked files in the current directory except for those in
     dotdirs.
+  * Added quickcheck to build dependencies, and fail if test suite cannot be
+    built.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 02 Jan 2012 14:19:19 -0400
 

debian/control

@@ -16,6 +16,7 @@ Build-Depends:
 	libghc-monad-control-dev (>= 0.3),
 	libghc-lifted-base-dev,
 	libghc-json-dev,
+	libghc-quickcheck2-dev,
 	ikiwiki,
 	perlmagick,
 	git,

doc/bugs/__34__make_test__34___fails_silently.mdwn

@@ -1 +1,4 @@
 `make test` fails silently when the test program cannot be built. This happens, for example, when attempting to compile git-annex with `QuickCheck-2.4.2`.
+
+> I've made "make test" exit nonzero if the test suite cannot be built.
+> [[done]] --[[Joey]]

git-annex.cabal

@@ -31,7 +31,7 @@ Executable git-annex
   Build-Depends: MissingH, hslogger, directory, filepath,
    unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
    pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, json, HTTP,
-   base < 5, monad-control, transformers-base, lifted-base
+   base < 5, monad-control, transformers-base, lifted-base, quickcheck >= 2.1
 
 Executable git-annex-shell
   Main-Is: git-annex-shell.hs