Mercurial > evolve

diff tests/test-simple4server-bundle2.t @ 1800:1554b30b18eb mercurial-3.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with 5.6.0 no extra changes were needed from the mercurial-3.5 branch.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 16:03:39 +0100
parents e359d33856c3 e036dfc8cfcc
children
line wrap: on
line diff
--- a/tests/test-simple4server-bundle2.t	Wed Feb 01 15:51:02 2017 +0100
+++ b/tests/test-simple4server-bundle2.t	Wed Feb 01 16:03:39 2017 +0100
@@ -140,7 +140,7 @@
 
   $ echo '[__temporary__]' >> server/.hg/hgrc
   $ echo 'advertiseobsolete=False' >> server/.hg/hgrc
-  $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
+  $ $TESTDIR/killdaemons.py $DAEMON_PIDS
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
@@ -150,7 +150,7 @@
   phases	
 
   $ echo 'advertiseobsolete=True' >> server/.hg/hgrc
-  $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
+  $ $TESTDIR/killdaemons.py $DAEMON_PIDS
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS