Really fix FTBFS on mipsel and sparc due to test suite not being available on those architectures.
This commit is contained in:
parent
9a5944c414
commit
3cbb366ebc
4 changed files with 17 additions and 6 deletions
|
@ -7,11 +7,12 @@
|
||||||
|
|
||||||
module Command.Test where
|
module Command.Test where
|
||||||
|
|
||||||
|
import Common
|
||||||
import Command
|
import Command
|
||||||
import Messages
|
import Messages
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
def = [ dontCheck repoExists $
|
def = [ noRepo startIO $ dontCheck repoExists $
|
||||||
command "test" paramNothing seek SectionPlumbing
|
command "test" paramNothing seek SectionPlumbing
|
||||||
"run built-in test suite"]
|
"run built-in test suite"]
|
||||||
|
|
||||||
|
@ -28,7 +29,10 @@ seek = [withWords start]
|
||||||
- test suite.
|
- test suite.
|
||||||
-}
|
-}
|
||||||
start :: [String] -> CommandStart
|
start :: [String] -> CommandStart
|
||||||
start [] = do
|
start ps = do
|
||||||
warning "git-annex was built without its test suite; not testing"
|
liftIO $ startIO ps
|
||||||
stop
|
stop
|
||||||
start _ = error "Cannot specify any additional parameters when running test"
|
|
||||||
|
startIO :: CmdParams -> IO ()
|
||||||
|
startIO [] = warningIO "git-annex was built without its test suite; not testing"
|
||||||
|
startIO _ = error "Cannot specify any additional parameters when running test"
|
||||||
|
|
|
@ -164,8 +164,8 @@ cmds = concat
|
||||||
, Command.XMPPGit.def
|
, Command.XMPPGit.def
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef WITH_TESTSUITE
|
|
||||||
, Command.Test.def
|
, Command.Test.def
|
||||||
|
#ifdef WITH_TESTSUITE
|
||||||
, Command.FuzzTest.def
|
, Command.FuzzTest.def
|
||||||
#endif
|
#endif
|
||||||
]
|
]
|
||||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,3 +1,10 @@
|
||||||
|
git-annex (5.20140117) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Really fix FTBFS on mipsel and sparc due to test suite not being available
|
||||||
|
on those architectures.
|
||||||
|
|
||||||
|
-- Joey Hess <joeyh@debian.org> Fri, 17 Jan 2014 14:46:27 -0400
|
||||||
|
|
||||||
git-annex (5.20140116) unstable; urgency=medium
|
git-annex (5.20140116) unstable; urgency=medium
|
||||||
|
|
||||||
* Added tahoe special remote.
|
* Added tahoe special remote.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Name: git-annex
|
Name: git-annex
|
||||||
Version: 5.20140116
|
Version: 5.20140117
|
||||||
Cabal-Version: >= 1.8
|
Cabal-Version: >= 1.8
|
||||||
License: GPL-3
|
License: GPL-3
|
||||||
Maintainer: Joey Hess <joey@kitenet.net>
|
Maintainer: Joey Hess <joey@kitenet.net>
|
||||||
|
|
Loading…
Add table
Reference in a new issue