# HG changeset patch # User Mads Kiilerich # Date 1320632094 -3600 # Node ID e0348815e806b01801eb60bab0fca1027ce44488 # Parent 9ab2b3b730eebd831995b3090ed39396a3d5cad5 tests: use 'hghave symlink' for tests using symlinks diff -r 9ab2b3b730ee -r e0348815e806 tests/hghave --- a/tests/hghave Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/hghave Mon Nov 07 03:14:54 2011 +0100 @@ -161,7 +161,7 @@ return matchoutput('p4 -V', r'Rev\. P4/') and matchoutput('p4d -V', r'Rev\. P4D/') def has_symlink(): - return hasattr(os, "symlink") + return hasattr(os, "symlink") # FIXME: should also check file system and os def has_tla(): return matchoutput('tla --version 2>&1', r'The GNU Arch Revision') diff -r 9ab2b3b730ee -r e0348815e806 tests/test-audit-path.t --- a/tests/test-audit-path.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-audit-path.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ hg init should fail diff -r 9ab2b3b730ee -r e0348815e806 tests/test-commit.t --- a/tests/test-commit.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-commit.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + commit date test $ hg init test diff -r 9ab2b3b730ee -r e0348815e806 tests/test-convert-bzr.t --- a/tests/test-convert-bzr.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-convert-bzr.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,4 @@ + $ "$TESTDIR/hghave" symlink || exit 80 $ . "$TESTDIR/bzr-definitions" diff -r 9ab2b3b730ee -r e0348815e806 tests/test-convert-svn-sink.t --- a/tests/test-convert-svn-sink.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-convert-svn-sink.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,5 +1,4 @@ - - $ "$TESTDIR/hghave" svn13 no-outer-repo || exit 80 + $ "$TESTDIR/hghave" svn13 no-outer-repo symlink || exit 80 $ fixpath() > { diff -r 9ab2b3b730ee -r e0348815e806 tests/test-convert-tla.t --- a/tests/test-convert-tla.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-convert-tla.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,5 +1,5 @@ - $ "$TESTDIR/hghave" tla || exit 80 + $ "$TESTDIR/hghave" tla symlink || exit 80 $ tla my-id "mercurial " $ echo "[extensions]" >> $HGRCPATH $ echo "convert=" >> $HGRCPATH diff -r 9ab2b3b730ee -r e0348815e806 tests/test-extdiff.t --- a/tests/test-extdiff.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-extdiff.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ echo "[extensions]" >> $HGRCPATH $ echo "extdiff=" >> $HGRCPATH diff -r 9ab2b3b730ee -r e0348815e806 tests/test-import-bypass.t --- a/tests/test-import-bypass.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-import-bypass.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ echo "[extensions]" >> $HGRCPATH $ echo "purge=" >> $HGRCPATH $ echo "graphlog=" >> $HGRCPATH diff -r 9ab2b3b730ee -r e0348815e806 tests/test-import-git.t --- a/tests/test-import-git.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-import-git.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,4 @@ + $ "$TESTDIR/hghave" symlink || exit 80 $ hg init diff -r 9ab2b3b730ee -r e0348815e806 tests/test-keyword.t --- a/tests/test-keyword.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-keyword.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ cat <> $HGRCPATH > [extensions] > keyword = diff -r 9ab2b3b730ee -r e0348815e806 tests/test-largefiles.t --- a/tests/test-largefiles.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-largefiles.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ cat >> $HGRCPATH < [extensions] > largefiles= diff -r 9ab2b3b730ee -r e0348815e806 tests/test-manifest.t --- a/tests/test-manifest.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-manifest.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + Source bundle was generated with the following script: # hg init diff -r 9ab2b3b730ee -r e0348815e806 tests/test-merge-symlinks.t --- a/tests/test-merge-symlinks.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-merge-symlinks.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,4 @@ + $ "$TESTDIR/hghave" symlink || exit 80 $ cat > echo.py < #!/usr/bin/env python diff -r 9ab2b3b730ee -r e0348815e806 tests/test-merge-types.t --- a/tests/test-merge-types.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-merge-types.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ hg init $ echo a > a diff -r 9ab2b3b730ee -r e0348815e806 tests/test-rename.t --- a/tests/test-rename.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-rename.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + $ hg init $ mkdir d1 d1/d11 d2 $ echo d1/a > d1/a diff -r 9ab2b3b730ee -r e0348815e806 tests/test-symlink-placeholder.t --- a/tests/test-symlink-placeholder.t Mon Nov 07 03:14:54 2011 +0100 +++ b/tests/test-symlink-placeholder.t Mon Nov 07 03:14:54 2011 +0100 @@ -1,3 +1,5 @@ + $ "$TESTDIR/hghave" symlink || exit 80 + Create extension that can disable symlink support: $ cat > nolink.py <