# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1625875114 -7200
# Node ID a8e33ab50c4fe830db81b194dc413fd79f0e5d63
# Parent  5654323832f07ea979f042b9746f1d5d94780fc0
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

diff -r 5654323832f0 -r a8e33ab50c4f tests/hghave.py
--- 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'")
diff -r 5654323832f0 -r a8e33ab50c4f tests/run-tests.py
--- 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: