Improve test suite on Windows; now tests git annex sync.
This commit is contained in:
parent
0545c960a7
commit
147a9f8882
3 changed files with 10 additions and 9 deletions
11
Test.hs
11
Test.hs
|
@ -642,15 +642,8 @@ test_version env = "git-annex version" ~: intmpclonerepo env $ do
|
||||||
git_annex env "version" [] @? "version failed"
|
git_annex env "version" [] @? "version failed"
|
||||||
|
|
||||||
test_sync :: TestEnv -> Test
|
test_sync :: TestEnv -> Test
|
||||||
test_sync env = "git-annex sync" ~: intmpclonerepo env $ do
|
test_sync env = "git-annex sync" ~: intmpclonerepo env $
|
||||||
{- For unknown reasons, running sync in the test suite on Windows
|
|
||||||
- fails with what looks like PATH errors. sync works outside
|
|
||||||
- the test suite though. TODO -}
|
|
||||||
#ifndef __WINDOWS__
|
|
||||||
git_annex env "sync" [] @? "sync failed"
|
git_annex env "sync" [] @? "sync failed"
|
||||||
#else
|
|
||||||
noop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
{- Regression test for union merge bug fixed in
|
{- Regression test for union merge bug fixed in
|
||||||
- 0214e0fb175a608a49b812d81b4632c081f63027 -}
|
- 0214e0fb175a608a49b812d81b4632c081f63027 -}
|
||||||
|
@ -1113,7 +1106,7 @@ prepare forcedirect = do
|
||||||
|
|
||||||
let env =
|
let env =
|
||||||
-- Ensure that the just-built git annex is used.
|
-- Ensure that the just-built git annex is used.
|
||||||
[ ("PATH", cwd ++ ":" ++ p)
|
[ ("PATH", cwd ++ [searchPathSeparator] ++ p)
|
||||||
, ("TOPDIR", cwd)
|
, ("TOPDIR", cwd)
|
||||||
-- Avoid git complaining if it cannot determine the user's
|
-- Avoid git complaining if it cannot determine the user's
|
||||||
-- email address, or exploding if it doesn't know the user's
|
-- email address, or exploding if it doesn't know the user's
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -28,6 +28,7 @@ git-annex (4.20130724) UNRELEASED; urgency=low
|
||||||
* OSX: Make git-annex-webapp run in the background, so that the app icon
|
* OSX: Make git-annex-webapp run in the background, so that the app icon
|
||||||
can be clicked on the open a new webapp when the assistant is already
|
can be clicked on the open a new webapp when the assistant is already
|
||||||
running.
|
running.
|
||||||
|
* Improve test suite on Windows; now tests git annex sync.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400
|
-- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,13 @@ git-annex, many things will not work. See [[todo/windows_support]] for
|
||||||
current status. Note especially that git-annex always uses [[direct_mode]]
|
current status. Note especially that git-annex always uses [[direct_mode]]
|
||||||
on Windows.
|
on Windows.
|
||||||
|
|
||||||
|
The autobuilder is not currently able to run the test suite, so
|
||||||
|
testing git-annex on Windows is up to you! To check that the build of
|
||||||
|
git-annex works in your Windows system, you are encouraged to run the test
|
||||||
|
suite before using git-annex on real data. After installation, run `git
|
||||||
|
annex test`. There will be a lot of output; the important thing is that it
|
||||||
|
should end with "All tests ok".
|
||||||
|
|
||||||
## autobuilds
|
## autobuilds
|
||||||
|
|
||||||
A daily build is also available, thanks to Yury V. Zaytsev and
|
A daily build is also available, thanks to Yury V. Zaytsev and
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue