diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-15 12:49:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-15 12:49:56 -0400 |
| commit | 1cf5e443c17af8c969857702ef06062ec21617b2 (patch) | |
| tree | 545ce18e08448e916eeb0522c5adc785a0d35387 | |
| parent | ee088c7ecdd604ae850093eab2518529ccdb68f6 (diff) | |
Fix FTBFS on mipsel and sparc due to test suite not being available on those architectures.
| -rw-r--r-- | Command/Test.hs | 12 | ||||
| -rw-r--r-- | GitAnnex.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Command/Test.hs b/Command/Test.hs index bf15dcf50..d4fa5eb5b 100644 --- a/Command/Test.hs +++ b/Command/Test.hs @@ -8,6 +8,7 @@ module Command.Test where import Command +import Messages def :: [Command] def = [ dontCheck repoExists $ @@ -19,6 +20,15 @@ seek = [withWords start] {- We don't actually run the test suite here because of a dependency loop. - The main program notices when the command is test and runs it; this - - function is never run if that works. -} + - function is never run if that works. + - + - However, if git-annex is built without the test suite, just print a + - warning, and do not exit nonzero. This is so git-annex test can be run + - in debian/rules despite some architectures not being able to build the + - test suite. + -} start :: [String] -> CommandStart +start [] = do + warning "git-annex was built without its test suite; not testing" + stop start _ = error "Cannot specify any additional parameters when running test" diff --git a/GitAnnex.hs b/GitAnnex.hs index 326b7641c..5de823e16 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -84,8 +84,8 @@ import qualified Command.WebApp import qualified Command.XMPPGit #endif #endif -#ifdef WITH_TESTSUITE import qualified Command.Test +#ifdef WITH_TESTSUITE import qualified Command.FuzzTest #endif #ifdef WITH_EKG diff --git a/debian/changelog b/debian/changelog index 8a9f57be3..14f1b183c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ git-annex (5.20140108) UNRELEASED; urgency=medium (These log files can be safely removed.) * assistant: Detect if .git/annex/index is corrupt at startup, and recover. + * Fix FTBFS on mipsel and sparc due to test suite not being available + on those architectures. -- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400 |