Mercurial > evolve
diff tests/test-simple4server.t @ 1606:c2739551ea4e mercurial-3.5
merge with stable through 3.6
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 11 Feb 2016 00:07:54 +0000 |
| parents | 97b9141cbf72 |
| children | e359d33856c3 d3429d25e0cb |
line wrap: on
line diff
--- a/tests/test-simple4server.t Thu Feb 04 11:07:44 2016 +0000 +++ b/tests/test-simple4server.t Thu Feb 11 00:07:54 2016 +0000 @@ -143,7 +143,7 @@ $ echo '[__temporary__]' >> server/.hg/hgrc $ echo 'advertiseobsolete=False' >> server/.hg/hgrc - $ $TESTDIR/killdaemons.py $DAEMON_PIDS + $ $RUNTESTDIR/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 @@ -157,7 +157,7 @@ [1] $ echo 'advertiseobsolete=True' >> server/.hg/hgrc - $ $TESTDIR/killdaemons.py $DAEMON_PIDS + $ $RUNTESTDIR/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