[PATCH V3] tests: match ps output in a way working on OS X

Augie Fackler raf at durin42.com
Tue Feb 11 12:10:05 CST 2014


On Tue, Feb 11, 2014 at 01:07:17PM +0100, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe at besonet.ch>
> # Date 1392120112 -3600
> #      Tue Feb 11 13:01:52 2014 +0100
> # Node ID 74e22640ea80f3be5afce90515ba61ac51cc7511
> # Parent  d98ba4a87427ce601dd23de8d4f5288cc44fe945
> tests: match ps output in a way working on OS X

LGTM, but patch is acting damaged here. Can you just give me a URL to pull from?

>
> On OS X, `ps` does not have the option --no-heading. Ignore the header with
> a
> glob match instead. Match the command lazier, because some systems could
> print
> a leading hyphen (-hg) or maybe the path (../hg).
>
> diff -r d98ba4a87427 -r 74e22640ea80 tests/test-treediscovery.t
> --- a/tests/test-treediscovery.t Mon Feb 10 17:31:26 2014 -0600
> +++ b/tests/test-treediscovery.t Tue Feb 11 13:01:52 2014 +0100
> @@ -30,13 +30,15 @@
>   $ hg init empty2
>   $ tstart empty2
> check if process of pid looks reasonable ('hg' normally, 'python' for
> run-tests.py -l)
> +(TODO: matching the right command depending on the test run would make more
> sense)
> #if windows
> ps of mingw does not support -p, tasklist is on any windows machine since XP
>   $ tasklist //NH //fi "pid eq `cat hg.pid`" | grep '  '
>   (.* )?(hg|python)\.exe( .*)? (re)
> #else
> -  $ ps --no-heading -p `cat hg.pid`
> -  (.* )?(hg|python)( .*)? (re)
> +  $ ps -p `cat hg.pid`
> +  .*
> +  (.*\w)?(hg|python)( .*)? (re)
> #endif
>   $ hg incoming -R empty1 $remote
>   comparing with http://localhost:$HGPORT/
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list