From 8512a4a1a1f5367249cdb12aab75ed5d1bb42c8a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Apr 2011 12:43:22 -0400 Subject: [PATCH] Remove testpack from build depends, as it is not available on all architectures. The test suite will not be run if it cannot be compiled. It may be possible later to split off the quickcheck using tests into a separate program and keep most of the tests using just hunit. --- Makefile | 7 +++++-- debian/changelog | 3 +++ debian/control | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a8eccc5bfd..69fb518074 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,11 @@ install: all fi test: $(bins) - $(GHCMAKE) test - ./test + if ! $(GHCMAKE) test; then \ + echo "** not running test suite" >&2; \ + else \ + ./test; \ + fi testcoverage: $(bins) rm -f test.tix test diff --git a/debian/changelog b/debian/changelog index 5955f29589..872277d0f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ git-annex (0.20110421) UNRELEASED; urgency=low * Use haskell Crypto library instead of haskell SHA library. + * Remove testpack from build depends, as it is not available + on all architectures. The test suite will not be run if it + cannot be compiled. -- Joey Hess Thu, 21 Apr 2011 16:35:27 -0400 diff --git a/debian/control b/debian/control index 97b04ea5b6..f9e6196aba 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Build-Depends: ghc, libghc-missingh-dev, libghc-pcre-light-dev, - libghc-testpack-dev, libghc-dataenc-dev, libghc-crypto-dev, libghc-utf8-string-dev,