# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1340208121 -7200
# Node ID 955662c1d0e9f6c4430218d9ec60f1a5fbe2fb85
# Parent  e0d9a3bfe406e8d80c0b305c067c18ecbf416f41
test-bookmarks-pushpull: partially adapt for Windows

The kill call at the end is redundant, as we already have

199:  $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
200:  $ cat ../hg.pid >> $DAEMON_PIDS

So there is nothing left that would not already be killed by the $DAEMON_PIDS
mechanism.

diff -r e0d9a3bfe406 -r 955662c1d0e9 tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t	Tue Jun 19 19:28:55 2012 +0200
+++ b/tests/test-bookmarks-pushpull.t	Wed Jun 20 18:02:01 2012 +0200
@@ -121,7 +121,7 @@
      foobar                    1:9b140be10808
 
   $ hg pull --config paths.foo=../a foo
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -251,6 +251,4 @@
      foo                       -1:000000000000
      foobar                    1:9b140be10808
 
-  $ kill `cat ../hg.pid`
-
   $ cd ..