| Submitter | Simon Heimberg |
|---|---|
| Date | Feb. 11, 2014, 12:07 p.m. |
| Message ID | <9CB91EAA2E4B836F1FAAEDAC@Simons-TOSH> |
| Download | mbox | patch |
| Permalink | /patch/3565/ |
| State | Deferred |
| Headers | show |
Comments
On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: > # HG changeset patch > # User Simon Heimberg <simohe@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 > > 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). Queued for default, thanks. Had to manually fix up some whitespace damage.
On Tue, Feb 11, 2014 at 01:07:17PM +0100, Simon Heimberg wrote: > # HG changeset patch > # User Simon Heimberg <simohe@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@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
--On 2014-02-11 11:32 -0600 Matt Mackall <mpm@selenic.com> wrote: > On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: >> # HG changeset patch >> # User Simon Heimberg <simohe@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 >> >> 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). > > Queued for default, thanks. Had to manually fix up some whitespace > damage. Thanks a lot for fixing. I know I should not paste a patch in an email program, but the computer was not configured for patchbomb and I hoped it would work. Sorry for the inconvenience. > > -- > Mathematics is the supreme nostalgia of our time.
On 02/11/2014 12:32 PM, Matt Mackall wrote: > On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: >> # HG changeset patch >> # User Simon Heimberg <simohe@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 >> >> 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). > > Queued for default, thanks. Had to manually fix up some whitespace > damage. This patch apparently never made it to main.
On 04/13/2014 12:40 AM, Pierre-Yves David wrote: > > > On 02/11/2014 12:32 PM, Matt Mackall wrote: >> On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: >>> # HG changeset patch >>> # User Simon Heimberg <simohe@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 >>> >>> 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). >> >> Queued for default, thanks. Had to manually fix up some whitespace >> damage. > > This patch apparently never made it to main. The relevant code have been backouted in 0e2877f8605dcaf4fdf2ab7e0046f1f6f80161dd Not sure why.
On 04/14/2014 05:06 AM, Pierre-Yves David wrote: > On 04/13/2014 12:40 AM, Pierre-Yves David wrote: >> >> >> On 02/11/2014 12:32 PM, Matt Mackall wrote: >>> On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: >>>> # HG changeset patch >>>> # User Simon Heimberg <simohe@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 >>>> >>>> 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). >>> >>> Queued for default, thanks. Had to manually fix up some whitespace >>> damage. >> >> This patch apparently never made it to main. > > The relevant code have been backouted in > 0e2877f8605dcaf4fdf2ab7e0046f1f6f80161dd > > Not sure why. ps is too different between bsd and sysv ... and the test was not really useful/relevant anyway. /Mads
--On Montag, 14. April 2014 19:52 +0200 Mads Kiilerich <mads@kiilerich.com> wrote: > On 04/14/2014 05:06 AM, Pierre-Yves David wrote: >> On 04/13/2014 12:40 AM, Pierre-Yves David wrote: >>> >>> >>> On 02/11/2014 12:32 PM, Matt Mackall wrote: >>>> On Tue, 2014-02-11 at 13:07 +0100, Simon Heimberg wrote: >>>>> # HG changeset patch >>>>> # User Simon Heimberg <simohe@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 >>>>> >>>>> 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). >>>> >>>> Queued for default, thanks. Had to manually fix up some whitespace >>>> damage. >>> >>> This patch apparently never made it to main. >> >> The relevant code have been backouted in >> 0e2877f8605dcaf4fdf2ab7e0046f1f6f80161dd >> >> Not sure why. > > ps is too different between bsd and sysv ... and the test was not really > useful/relevant anyway. Exactly. I remember again. Maybe the commit message of the backout should have been more verbose. > > /Mads
Patch
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)