Mercurial > hg-stable
changeset 16972:5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Seen on Linux with FAT.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 15 Jun 2012 00:02:27 +0200 |
| parents | 8aeb2f1ae94c |
| children | 3d71807c3a48 |
| files | tests/test-convert-baz.t tests/test-convert-cvsnt-mergepoints.t tests/test-merge-tools.t tests/test-transplant.t tests/test-walk.t |
| diffstat | 5 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-baz.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-convert-baz.t Fri Jun 15 00:02:27 2012 +0200 @@ -1,4 +1,4 @@ - $ "$TESTDIR/hghave" baz || exit 80 + $ "$TESTDIR/hghave" baz symlink || exit 80 $ baz my-id "mercurial <mercurial@selenic.com>"
--- a/tests/test-convert-cvsnt-mergepoints.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-convert-cvsnt-mergepoints.t Fri Jun 15 00:02:27 2012 +0200 @@ -91,6 +91,8 @@ $ echo xyzzy > foo.txt $ cvsci -m "merge1+clobber" foo.txt +#if unix-permissions + return to trunk and merge MYBRANCH1_2 $ cvscall -Q update -P -A @@ -200,5 +202,6 @@ Members: foo.txt:1.1.4.1->1.1.4.2 +#endif $ cd ..
--- a/tests/test-merge-tools.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-merge-tools.t Fri Jun 15 00:02:27 2012 +0200 @@ -277,6 +277,8 @@ # hg stat M f +#if unix-permissions + environment variables in true.executable are handled: $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh" @@ -300,6 +302,8 @@ # hg stat M f +#endif + Tool selection and merge-patterns merge-patterns specifies new tool false:
--- a/tests/test-transplant.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-transplant.t Fri Jun 15 00:02:27 2012 +0200 @@ -356,6 +356,8 @@ $ cd .. +#if unix-permissions system-sh + test filter $ hg init filter @@ -443,6 +445,9 @@ [255] $ cd .. +#endif + + test with a win32ext like setup (differing EOLs) $ hg init twin1
--- a/tests/test-walk.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-walk.t Fri Jun 15 00:02:27 2012 +0200 @@ -276,9 +276,11 @@ $ hg debugwalk NOEXIST NOEXIST: * (glob) +#if fifo $ mkfifo fifo $ hg debugwalk fifo fifo: unsupported file type (type is fifo) +#endif $ rm fenugreek $ hg debugwalk fenugreek