[Updated] D9814: hghave: split apart testing for the curses module and `tic` executable

[mharbison72 (Matt Harbison)]

Closed by commit rHGe5e6282fa66a: hghave: split apart testing for the curses module and `tic` executable (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9814?vs=25096&id=25111

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9814/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9814

AFFECTED FILES
  tests/hghave.py
  tests/test-commit-interactive-curses.t
  tests/test-revert-interactive-curses.t

CHANGE DETAILS

diff --git a/tests/test-revert-interactive-curses.t b/tests/test-revert-interactive-curses.t
--- a/tests/test-revert-interactive-curses.t
+++ b/tests/test-revert-interactive-curses.t
@@ -1,4 +1,4 @@
-#require tic
+#require curses
 
 Revert interactive tests with the Curses interface
 
diff --git a/tests/test-commit-interactive-curses.t b/tests/test-commit-interactive-curses.t
--- a/tests/test-commit-interactive-curses.t
+++ b/tests/test-commit-interactive-curses.t
@@ -1,4 +1,4 @@
-#require tic
+#require curses
 
 Set up a repo
 
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -702,8 +702,8 @@
     return os.path.isdir(os.path.join(t, "..", ".hg"))
 
 
- at check("tic", "terminfo compiler and curses module")
-def has_tic():
+ at check("curses", "terminfo compiler and curses module")
+def has_curses():
     try:
         import curses
 
@@ -714,11 +714,17 @@
         if os.name == 'nt':
             return True
 
-        return matchoutput('test -x "`which tic`"', br'')
+        return has_tic()
+
     except (ImportError, AttributeError):
         return False
 
 
+ at check("tic", "terminfo compiler")
+def has_tic():
+    return matchoutput('test -x "`which tic`"', br'')
+
+
 @check("xz", "xz compression utility")
 def has_xz():
     # When Windows invokes a subprocess in shell mode, it uses `cmd.exe`, which



To: mharbison72, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210118/ea9e1b55/attachment-0002.html>