--- a/tests/test-keyword	Wed Jul 30 20:05:14 2008 +0200
+++ b/tests/test-keyword	Thu Aug 21 19:07:33 2008 +0200
@@ -267,7 +267,23 @@
 cd ..
 
 echo % kwexpand nonexistent
-hg kwexpand nonexistent
+hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
+
+#echo % hg serve
+#hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+#cat hg.pid >> $DAEMON_PIDS
+#echo % expansion
+#echo % hgweb file
+#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw')
+#echo % no expansion
+#echo % hgweb annotate
+#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw')
+#echo % hgweb changeset
+#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
+#echo % hgweb filediff
+#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
+#echo % errors encountered
+#cat errors.log
 
 echo % switch off expansion
 echo % kwshrink with unknown file u
@@ -283,12 +299,3 @@
 cat a b
 echo % hg cat
 hg cat a b
-
-echo % hg serve
-test -n "$HGPORT" || export HGPORT=20063
-hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
-cat hg.pid >> $DAEMON_PIDS
-echo % hgweb changeset
-("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
-echo % errors encountered
-cat errors.log

--- a/tests/test-keyword.out	Wed Jul 30 20:05:14 2008 +0200
+++ b/tests/test-keyword.out	Thu Aug 21 19:07:33 2008 +0200
@@ -299,7 +299,7 @@
 xxx $
 $Xinfo$
 % kwexpand nonexistent
-nonexistent: No such file or directory
+nonexistent:
 % switch off expansion
 % kwshrink with unknown file u
 overwriting a shrinking keywords
@@ -328,24 +328,3 @@
 xxx $
 $Xinfo$
 ignore $Id$
-% hg serve
-% hgweb changeset
-200 Script output follows
-
-
-# HG changeset patch
-# User User Name <user@example.com>
-# Date 3 0
-# Node ID 93c8b61c99cd3081911aaa80cbeef1061a11c97a
-# Parent 9ea11ce3ca13e750b2187a042a5a92c302cf043f
-xa
-
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
-@@ -0,0 +1,4 @@
-+expand $Id$
-+do not process $Id:
-+xxx $
-+$Xinfo$
-
-% errors encountered