diff --git a/tests/test-convert.t b/tests/test-convert.t --- a/tests/test-convert.t +++ b/tests/test-convert.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" unix-permissions || exit 80 - $ cat >> $HGRCPATH < [extensions] > convert= @@ -293,24 +291,27 @@ pulling from ../a searching for changes no changes found - $ touch bogusfile -should fail +conversion to existing file should fail + $ touch bogusfile $ hg convert a bogusfile initializing destination bogusfile repository abort: cannot create new bundle repository [255] + +#if unix-permissions + +conversion to dir without permissions should fail + $ mkdir bogusdir $ chmod 000 bogusdir -should fail - $ hg convert a bogusdir abort: Permission denied: bogusdir [255] -should succeed +user permissions should succeed $ chmod 700 bogusdir $ hg convert a bogusdir @@ -324,6 +325,8 @@ should succeed 1 d 0 e +#endif + test pre and post conversion actions $ echo 'include b' > filemap diff --git a/tests/test-eol.t b/tests/test-eol.t --- a/tests/test-eol.t +++ b/tests/test-eol.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" unix-permissions || exit 80 - Test EOL extension $ cat >> $HGRCPATH <> $HGRCPATH + $ echo 'eol =' >> $HGRCPATH + +#if unix-permissions + Test issue2569 -- eol extension takes write lock on reading: - $ echo '[extensions]' >> $HGRCPATH - $ echo 'eol =' >> $HGRCPATH $ hg init repo $ cd repo $ touch .hgeol @@ -403,6 +404,8 @@ Test issue2569 -- eol extension takes wr $ chmod -R u+w .hg $ cd .. +#endif + Test cleverencode: and cleverdecode: aliases for win32text extension $ echo '[encode]' >> $HGRCPATH diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t --- a/tests/test-largefiles-cache.t +++ b/tests/test-largefiles-cache.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" unix-permissions || exit 80 - Create user cache directory $ USERCACHE=`pwd`/cache; export USERCACHE @@ -72,10 +70,12 @@ Update working directory to tip, again. 0 largefiles updated, 0 removed $ hg status ! large + $ cd .. + +#if unix-permissions Portable way to print file permissions: - $ cd .. $ cat > ls-l.py < #!/usr/bin/env python > import sys, os @@ -121,3 +121,5 @@ Test permission of files created by push 640 $ cd .. + +#endif diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -1,4 +1,4 @@ - $ "$TESTDIR/hghave" unix-permissions serve || exit 80 + $ "$TESTDIR/hghave" serve || exit 80 $ USERCACHE=`pwd`/cache; export USERCACHE $ mkdir -p ${USERCACHE} $ cat >> $HGRCPATH <