[PATCH STABLE] hghave: don't claim we have `tic` if it's NetBSD's binary (issue5698)

Kyle Lippincott spectral at google.com
Mon Jun 25 14:46:12 EDT 2018


Looks good to me, though I don't have a NetBSD system to test. :)

On Mon, Jun 25, 2018 at 6:28 AM, Augie Fackler <raf at durin42.com> wrote:

> # HG changeset patch
> # User Augie Fackler <augie at google.com>
> # Date 1529932907 14400
> #      Mon Jun 25 09:21:47 2018 -0400
> # Branch stable
> # Node ID 348d58daa074a5395eb483816c74c31190892d5f
> # Parent  1322ae04d3d71c9bab8ca6e70c77dfa867421c9b
> hghave: don't claim we have `tic` if it's NetBSD's binary (issue5698)
>
> test-status-color.t fails with different output because of mismatches
> between how `tic` behaves from NetBSD's base system and ncurses'
> verison (if I understand the bug right). The bug suggested using -V to
> avoid the issue, so we'll do that.
>
> diff --git a/tests/hghave.py b/tests/hghave.py
> --- a/tests/hghave.py
> +++ b/tests/hghave.py
> @@ -545,7 +545,11 @@ def has_tic():
>      try:
>          import curses
>          curses.COLOR_BLUE
> -        return matchoutput('test -x "`which tic`"', br'')
> +        if not matchoutput('test -x "`which tic`"', br''):
> +            return False
> +        # We have a tic, but make sure it's not the NetBSD system one
> +        # which doesn't pass test-status-color.t.
> +        return not matchoutput('tic -V', br'unknown option')
>      except ImportError:
>          return False
>
>


-- 
--Kyle

Note:
If I've asked a question, and you're responding to me, please use *respond
all*, so that other people can read any solutions we come to!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20180625/4939158c/attachment.html>


More information about the Mercurial-devel mailing list