Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: use more explicit signaling for `chg`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 10 Jul 2021 01:58:34 +0200
changeset 47586 a8e33ab50c4f
parent 47585 5654323832f0
child 47587 be496e3489b9
run-tests: use more explicit signaling for `chg` Using a dedicated variable is clearer and less fragile. It cannot hurt. Differential Revision: https://phab.mercurial-scm.org/D11051
tests/hghave.py file | annotate | diff | comparison | revisions
tests/run-tests.py file | annotate | diff | comparison | revisions 
--- a/tests/hghave.py	Sat Jul 10 01:57:35 2021 +0200
+++ b/tests/hghave.py	Sat Jul 10 01:58:34 2021 +0200
@@ -191,7 +191,7 @@
 
 @check("chg", "running with chg")
 def has_chg():
-    return 'CHGHG' in os.environ
+    return 'CHG_INSTALLED_AS_HG' in os.environ
 
 
 @check("rhg", "running with rhg as 'hg'")
--- a/tests/run-tests.py	Sat Jul 10 01:57:35 2021 +0200
+++ b/tests/run-tests.py	Sat Jul 10 01:58:34 2021 +0200
@@ -3165,9 +3165,11 @@
         # set CHGHG, then replace "hg" command by "chg"
         chgbindir = self._bindir
         if self.options.chg or self.options.with_chg:
+            osenvironb[b'CHG_INSTALLED_AS_HG'] = b'1'
             osenvironb[b'CHGHG'] = real_hg
         else:
-            osenvironb.pop(b'CHGHG', None)  # drop flag for hghave
+            # drop flag for hghave
+            osenvironb.pop(b'CHG_INSTALLED_AS_HG', None)
         if self.options.chg:
             self._hgcommand = b'chg'
         elif self.options.with_chg:
mercurial