Patchwork test: test-bundle-type.t needs to work more universally

login
register
mail settings
Submitter Danek Duvall
Date Nov. 10, 2015, 6:03 p.m.
Message ID <266a962e2b3c7497a996.1447178637@smelly.us.oracle.com>
Download mbox | patch
Permalink /patch/11348/
State Accepted
Headers show

Comments

Danek Duvall - Nov. 10, 2015, 6:03 p.m.
# HG changeset patch
# User Danek Duvall <danek.duvall@oracle.com>
# Date 1447178290 28800
#      Tue Nov 10 09:58:10 2015 -0800
# Node ID 266a962e2b3c7497a99688996a81b203fab5bb81
# Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
test: test-bundle-type.t needs to work more universally

The cut and head utilities on Solaris have weird differences from the GNU
versions.  The f helper script does a dump more nicely than those tools,
anyway.
Yuya Nishihara - Nov. 12, 2015, 1:53 p.m.
On Tue, 10 Nov 2015 10:03:57 -0800, danek.duvall@oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@oracle.com>
> # Date 1447178290 28800
> #      Tue Nov 10 09:58:10 2015 -0800
> # Node ID 266a962e2b3c7497a99688996a81b203fab5bb81
> # Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
> test: test-bundle-type.t needs to work more universally
> 
> The cut and head utilities on Solaris have weird differences from the GNU
> versions.  The f helper script does a dump more nicely than those tools,
> anyway.
> 
> diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t
> --- a/tests/test-bundle-type.t
> +++ b/tests/test-bundle-type.t
> @@ -34,7 +34,7 @@ test bundle types
>    >   hg init t$t
>    >   cd t1
>    >   hg bundle -t $t ../b$t ../t$t
> -  >   cut -b 1-6 ../b$t | head -n 1
> +  >   f -q -B6 -D ../b$t; echo

Looks good to me. Should I push it for stable?
Danek Duvall - Nov. 12, 2015, 2:18 p.m.
Yuya Nishihara wrote:

> On Tue, 10 Nov 2015 10:03:57 -0800, danek.duvall@oracle.com wrote:
> > # HG changeset patch
> > # User Danek Duvall <danek.duvall@oracle.com>
> > # Date 1447178290 28800
> > #      Tue Nov 10 09:58:10 2015 -0800
> > # Node ID 266a962e2b3c7497a99688996a81b203fab5bb81
> > # Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
> > test: test-bundle-type.t needs to work more universally
> > 
> > The cut and head utilities on Solaris have weird differences from the GNU
> > versions.  The f helper script does a dump more nicely than those tools,
> > anyway.
> > 
> > diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t
> > --- a/tests/test-bundle-type.t
> > +++ b/tests/test-bundle-type.t
> > @@ -34,7 +34,7 @@ test bundle types
> >    >   hg init t$t
> >    >   cd t1
> >    >   hg bundle -t $t ../b$t ../t$t
> > -  >   cut -b 1-6 ../b$t | head -n 1
> > +  >   f -q -B6 -D ../b$t; echo
> 
> Looks good to me. Should I push it for stable?

That'd be great!

Thanks,
Danek
Yuya Nishihara - Nov. 12, 2015, 2:49 p.m.
On Thu, 12 Nov 2015 06:18:03 -0800, Danek Duvall wrote:
> Yuya Nishihara wrote:
> 
> > On Tue, 10 Nov 2015 10:03:57 -0800, danek.duvall@oracle.com wrote:
> > > # HG changeset patch
> > > # User Danek Duvall <danek.duvall@oracle.com>
> > > # Date 1447178290 28800
> > > #      Tue Nov 10 09:58:10 2015 -0800
> > > # Node ID 266a962e2b3c7497a99688996a81b203fab5bb81
> > > # Parent  8b2fbe3f59b1b969878691cb472369ad0067f165
> > > test: test-bundle-type.t needs to work more universally
> > > 
> > > The cut and head utilities on Solaris have weird differences from the GNU
> > > versions.  The f helper script does a dump more nicely than those tools,
> > > anyway.
> > > 
> > > diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t
> > > --- a/tests/test-bundle-type.t
> > > +++ b/tests/test-bundle-type.t
> > > @@ -34,7 +34,7 @@ test bundle types
> > >    >   hg init t$t
> > >    >   cd t1
> > >    >   hg bundle -t $t ../b$t ../t$t
> > > -  >   cut -b 1-6 ../b$t | head -n 1
> > > +  >   f -q -B6 -D ../b$t; echo
> > 
> > Looks good to me. Should I push it for stable?
> 
> That'd be great!

Rebased onto stable and pushed to the clowncopter, thanks.

Patch

diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t
--- a/tests/test-bundle-type.t
+++ b/tests/test-bundle-type.t
@@ -34,7 +34,7 @@  test bundle types
   >   hg init t$t
   >   cd t1
   >   hg bundle -t $t ../b$t ../t$t
-  >   cut -b 1-6 ../b$t | head -n 1
+  >   f -q -B6 -D ../b$t; echo
   >   cd ../t$t
   >   hg debugbundle ../b$t
   >   echo