summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-25 12:43:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-25 12:43:22 -0400
commit8512a4a1a1f5367249cdb12aab75ed5d1bb42c8a (patch)
tree9165e9cc360016ee4d7ea4f119c91402acd7baf3
parentb72de39ba469fb7f39be0728a10fe949619c7be0 (diff)
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.
-rw-r--r--Makefile7
-rw-r--r--debian/changelog3
-rw-r--r--debian/control1
3 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a8eccc5bf..69fb51807 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 5955f2958..872277d0f 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 <joeyh@debian.org> Thu, 21 Apr 2011 16:35:27 -0400
diff --git a/debian/control b/debian/control
index 97b04ea5b..f9e6196ab 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,