--- a/tests/test-keyword.t	Wed Jul 04 02:04:58 2012 +0200
+++ b/tests/test-keyword.t	Tue Jul 03 18:02:07 2012 +0200
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" unix-permissions serve || exit 80
-
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > keyword =
@@ -297,16 +295,20 @@
 
   $ echo '$Id$' > c
   $ echo 'tests for different changenodes' >> c
+#if unix-permissions
   $ chmod 600 c
   $ ls -l c | cut -b 1-10
   -rw-------
+#endif
 
 commit file c
 
   $ hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>'
   adding c
+#if unix-permissions
   $ ls -l c | cut -b 1-10
   -rw-------
+#endif
 
 force expansion
 
@@ -330,10 +332,10 @@
 
 record chunk
 
-  >>> lines = open('a').readlines()
+  >>> lines = open('a', 'rb').readlines()
   >>> lines.insert(1, 'foo\n')
   >>> lines.append('bar\n')
-  >>> open('a', 'w').writelines(lines)
+  >>> open('a', 'wb').writelines(lines)
   $ hg record -d '10 1' -m rectest a<<EOF
   > y
   > y
@@ -612,6 +614,7 @@
 cp symlink file; hg cp -A symlink file (part1)
 - copied symlink points to kwfile: overwrite
 
+#if symlink
   $ cp sym i
   $ ls -l i
   -rw-r--r--* (glob)
@@ -624,6 +627,7 @@
   expand $Id$
   $ hg forget i
   $ rm i
+#endif
 
 Test different options of hg kwfiles
 
@@ -924,6 +928,7 @@
   nonexistent:* (glob)
 
 
+#if serve
 hg serve
  - expand with hgweb file
  - no expansion with hgweb annotate/changeset/filediff
@@ -987,6 +992,7 @@
   
   
   $ cat errors.log
+#endif
 
 Prepare merge and resolve tests