Fix FTBFS on mipsel and sparc due to test suite not being available on those architectures.
This commit is contained in:
parent
9ea52b03c6
commit
daec7ffafe
3 changed files with 14 additions and 2 deletions
|
@ -8,6 +8,7 @@
|
||||||
module Command.Test where
|
module Command.Test where
|
||||||
|
|
||||||
import Command
|
import Command
|
||||||
|
import Messages
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
def = [ dontCheck repoExists $
|
def = [ dontCheck repoExists $
|
||||||
|
@ -19,6 +20,15 @@ seek = [withWords start]
|
||||||
|
|
||||||
{- We don't actually run the test suite here because of a dependency loop.
|
{- 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
|
- 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 :: [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"
|
start _ = error "Cannot specify any additional parameters when running test"
|
||||||
|
|
|
@ -84,8 +84,8 @@ import qualified Command.WebApp
|
||||||
import qualified Command.XMPPGit
|
import qualified Command.XMPPGit
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef WITH_TESTSUITE
|
|
||||||
import qualified Command.Test
|
import qualified Command.Test
|
||||||
|
#ifdef WITH_TESTSUITE
|
||||||
import qualified Command.FuzzTest
|
import qualified Command.FuzzTest
|
||||||
#endif
|
#endif
|
||||||
#ifdef WITH_EKG
|
#ifdef WITH_EKG
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -15,6 +15,8 @@ git-annex (5.20140108) UNRELEASED; urgency=medium
|
||||||
(These log files can be safely removed.)
|
(These log files can be safely removed.)
|
||||||
* assistant: Detect if .git/annex/index is corrupt at startup, and
|
* assistant: Detect if .git/annex/index is corrupt at startup, and
|
||||||
recover.
|
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
|
-- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue