Patchwork [STABLE] test-cache-abuse: correct for different hunk headers between Solaris and GNU

login
register
mail settings
Submitter Danek Duvall
Date May 27, 2016, 6:27 p.m.
Message ID <b1ffda6b55ce3f920fae.1464373675@smelly.us.oracle.com>
Download mbox | patch
Permalink /patch/15224/
State Accepted
Commit b0b85d8695cbd5fd6d134395afcb0caccb5fb20d
Headers show

Comments

Danek Duvall - May 27, 2016, 6:27 p.m.
# HG changeset patch
# User Danek Duvall <danek.duvall@oracle.com>
# Date 1464372869 25200
#      Fri May 27 11:14:29 2016 -0700
# Branch stable
# Node ID b1ffda6b55ce3f920faec1d553c9fafafb4d8c9c
# Parent  89bba2beb03ea62e7fc8bcf3272e3cda1065ad89
test-cache-abuse: correct for different hunk headers between Solaris and GNU

When diffing against an empty file, Solaris diff uses 1 to designate the
first line of the empty file (either -1,0 on the left or +1,0 on the right)
while GNU diff uses 0 (-0,0 and +0,0).  We use a glob here to make sure the
test passes with either toolchain.

I've not added tests to check-code because there are scads of places in the
tests where the GNU format is used due to that being the format that "hg
diff" and "hg export" use, and changing those to use globs seems wrong.
Augie Fackler - May 28, 2016, 9:48 p.m.
On Fri, May 27, 2016 at 11:27:55AM -0700, danek.duvall@oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@oracle.com>
> # Date 1464372869 25200
> #      Fri May 27 11:14:29 2016 -0700
> # Branch stable
> # Node ID b1ffda6b55ce3f920faec1d553c9fafafb4d8c9c
> # Parent  89bba2beb03ea62e7fc8bcf3272e3cda1065ad89
> test-cache-abuse: correct for different hunk headers between Solaris and GNU
>
> When diffing against an empty file, Solaris diff uses 1 to designate the
> first line of the empty file (either -1,0 on the left or +1,0 on the right)
> while GNU diff uses 0 (-0,0 and +0,0).  We use a glob here to make sure the
> test passes with either toolchain.
>
> I've not added tests to check-code because there are scads of places in the
> tests where the GNU format is used due to that being the format that "hg
> diff" and "hg export" use, and changing those to use globs seems wrong.

Sounds reasonable. Maybe coordinate with Kevin about getting a Solaris
buildbot slave set up so we can notice these proactively?

>
> diff --git a/tests/test-cache-abuse.t b/tests/test-cache-abuse.t
> --- a/tests/test-cache-abuse.t
> +++ b/tests/test-cache-abuse.t
> @@ -88,7 +88,7 @@ We currently can't detect an rbc cache w
>    $ damage "log -qr branch(b2)" rbc-names-v1
>    --- before	* (glob)
>    +++ after	* (glob)
> -  @@ -1,8 +0,0 @@
> +  @@ -1,8 +?,0 @@ (glob)
>    -2:5fb7d38b9dc4
>    -3:60b597ffdafa
>    -4:b1174d11b69e
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Danek Duvall - May 28, 2016, 10:40 p.m.
Augie Fackler wrote:

> On Fri, May 27, 2016 at 11:27:55AM -0700, danek.duvall@oracle.com wrote:
> > # HG changeset patch
> > # User Danek Duvall <danek.duvall@oracle.com>
> > # Date 1464372869 25200
> > #      Fri May 27 11:14:29 2016 -0700
> > # Branch stable
> > # Node ID b1ffda6b55ce3f920faec1d553c9fafafb4d8c9c
> > # Parent  89bba2beb03ea62e7fc8bcf3272e3cda1065ad89
> > test-cache-abuse: correct for different hunk headers between Solaris and GNU
> >
> > When diffing against an empty file, Solaris diff uses 1 to designate the
> > first line of the empty file (either -1,0 on the left or +1,0 on the right)
> > while GNU diff uses 0 (-0,0 and +0,0).  We use a glob here to make sure the
> > test passes with either toolchain.
> >
> > I've not added tests to check-code because there are scads of places in the
> > tests where the GNU format is used due to that being the format that "hg
> > diff" and "hg export" use, and changing those to use globs seems wrong.
> 
> Sounds reasonable. Maybe coordinate with Kevin about getting a Solaris
> buildbot slave set up so we can notice these proactively?

Yep; we did that at the SF sprint, but I've been slow at getting it up and
running.  Letting the perfect be the enemy of the good and all ...

Danek

> >
> > diff --git a/tests/test-cache-abuse.t b/tests/test-cache-abuse.t
> > --- a/tests/test-cache-abuse.t
> > +++ b/tests/test-cache-abuse.t
> > @@ -88,7 +88,7 @@ We currently can't detect an rbc cache w
> >    $ damage "log -qr branch(b2)" rbc-names-v1
> >    --- before	* (glob)
> >    +++ after	* (glob)
> > -  @@ -1,8 +0,0 @@
> > +  @@ -1,8 +?,0 @@ (glob)
> >    -2:5fb7d38b9dc4
> >    -3:60b597ffdafa
> >    -4:b1174d11b69e
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel@mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-cache-abuse.t b/tests/test-cache-abuse.t
--- a/tests/test-cache-abuse.t
+++ b/tests/test-cache-abuse.t
@@ -88,7 +88,7 @@  We currently can't detect an rbc cache w
   $ damage "log -qr branch(b2)" rbc-names-v1
   --- before	* (glob)
   +++ after	* (glob)
-  @@ -1,8 +0,0 @@
+  @@ -1,8 +?,0 @@ (glob)
   -2:5fb7d38b9dc4
   -3:60b597ffdafa
   -4:b1174d11b69e