Mercurial > hg > mercurial-source

diff tests/test-extdiff.t @ 16898:8149ff405c78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: convert some 'hghave execbit' to #if This enables some new tests for running on windows.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 10 Jun 2012 14:14:05 +0200 (2012-06-10)
parents db0340f4b507
children b623e323c561
line wrap: on
line diff
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" symlink execbit || exit 80
-
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "extdiff=" >> $HGRCPATH
 
@@ -94,6 +92,8 @@
   diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob)
   diff-like tools yield a non-zero exit code
 
+#if execbit
+
 Test extdiff of multiple files in tmp dir:
 
   $ hg update -C 0 > /dev/null
@@ -182,6 +182,10 @@
 
   $ cd ..
 
+#endif
+
+#if symlink
+
 Test symlinks handling (issue1909)
 
   $ hg init testsymlinks
@@ -196,3 +200,5 @@
   diffing testsymlinks.07f494440405 testsymlinks
   [1]
   $ cd ..
+
+#endif