--- a/tests/test-known.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-known.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
= Test the known() protocol function =
@@ -35,4 +35,5 @@
$ hg debugknown http://localhost:$HGPORT/
$ cat error.log
+ $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
--- a/tests/test-mq-qclone-http.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-mq-qclone-http.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
hide outer repo
$ hg init
@@ -151,3 +151,6 @@
[1]
$ hg --cwd d log --mq --template '{rev} {desc|firstline}\n'
0 b.patch
+
+ $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+
--- a/tests/test-mq-qimport.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-mq-qimport.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
$ cat > writelines.py <<EOF
> import sys
@@ -278,3 +278,5 @@
1: secret
$ cd ..
+
+ $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
--- a/tests/test-phases-exchange.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-phases-exchange.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
$ cat >> $HGRCPATH <<EOF
> [extensions]
@@ -1062,4 +1062,5 @@
|
o 0 public a-A - 054250a37db4
+ $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
--- a/tests/test-pull-http.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-pull-http.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
$ hg init test
$ cd test
@@ -49,7 +49,7 @@
> hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
> cat hg.pid >> $DAEMON_PIDS
> hg --cwd ../test pull http://localhost:$HGPORT/
- > kill `cat hg.pid`
+ > "$TESTDIR/killdaemons.py" hg.pid
> echo % serve errors
> cat errors.log
> }
--- a/tests/test-push-http.t Fri Sep 14 20:40:52 2012 +0200
+++ b/tests/test-push-http.t Fri Sep 14 21:05:24 2012 +0200
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" serve || exit 80
+ $ "$TESTDIR/hghave" killdaemons || exit 80
$ hg init test
$ cd test