diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-03 14:52:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-03 14:52:20 -0400 |
| commit | 7e6a54f98422bf0bab1d1aad5980df3e60220ff8 (patch) | |
| tree | 29a95b672f42f329f7d68a0b6096495741f37cff | |
| parent | 6b7ee8486d00d4e067257d57c574b371f8e4e3d0 (diff) | |
Added quickcheck to build dependencies, and fail if test suite cannot be built.
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | doc/bugs/__34__make_test__34___fails_silently.mdwn | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
5 files changed, 12 insertions, 7 deletions
@@ -66,12 +66,11 @@ install: all test: @if ! $(GHCMAKE) -O0 test; then \ - echo "** not running test suite" >&2; \ - else \ - if ! ./test; then \ - echo "** test suite failed!" >&2; \ - exit 1; \ - fi; \ + echo "** failed to build the test suite" >&2; \ + exit 1; \ + elif ! ./test; then \ + echo "** test suite failed!" >&2; \ + exit 1; \ fi testcoverage: diff --git a/debian/changelog b/debian/changelog index c9619114e..607505387 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/control b/debian/control index 3f88c71ea..6a312c6b1 100644 --- a/debian/control +++ b/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, diff --git a/doc/bugs/__34__make_test__34___fails_silently.mdwn b/doc/bugs/__34__make_test__34___fails_silently.mdwn index 3bd4bd869..8632f03f5 100644 --- a/doc/bugs/__34__make_test__34___fails_silently.mdwn +++ b/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]] diff --git a/git-annex.cabal b/git-annex.cabal index 902acd0de..93238f49f 100644 --- a/git-annex.cabal +++ b/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 |