[PATCH 3 of 3 stable] tests: diff -r on Solaris emits "Common subdirectories:"

Danek Duvall danek.duvall at oracle.com
Tue Jul 21 17:18:06 CDT 2015


Augie Fackler wrote:

> On Tue, Jul 21, 2015 at 10:34:48AM -0700, Sean Farley wrote:
> >
> > danek.duvall at oracle.com writes:
> >
> > > # HG changeset patch
> > > # User Danek Duvall <danek.duvall at oracle.com>
> > > # Date 1437432159 25200
> > > #      Mon Jul 20 15:42:39 2015 -0700
> > > # Branch stable
> > > # Node ID 8adc0c228606715c7692d9e641efcac272256405
> > > # Parent  f578f809c667df19e54882cb5f535522d351ac2e
> > > tests: diff -r on Solaris emits "Common subdirectories:"
> > >
> > > When using the -r option to Solaris diff, any directores that compare
> > > identically are mentioned in the output.  We don't really care about these
> > > directories for the purposes of this test, so ignore them.
> >
> > These look pretty straight-forward to me but I have not actually run the tests.
> 
> These also look good to me. I'm kind of bummed about having to use
> egrep, but I think that's probably life on Solaris...

To some extent, yes.  For the ones where there's really no decent
cross-platform solution, I just create a patch for our build and try not to
bother you guys with it.

There's a specific behavior of GNU tail, for instance, used in
test-convert-hg-sink, that Solaris tail doesn't have, but a) there's
already an enhancement request filed for that and b) there's no good
workaround, so I just make the test use gtail.

Or extdiff, which assumes that "diff" understands the -N flag.  There's no
good way of reworking that, so I have it simply run "gdiff" instead.

Danek


More information about the Mercurial-devel mailing list