run-tests: drop the `rhg` flag for `hghave.py` if unset
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 10 Jul 2021 01:57:35 +0200
changeset 47585 5654323832f0
parent 47584 ee1fc8f970e6
child 47586 a8e33ab50c4f
run-tests: drop the `rhg` flag for `hghave.py` if unset This seems cleaner. Differential Revision: https://phab.mercurial-scm.org/D11050
tests/run-tests.py
--- a/tests/run-tests.py	Fri Jul 09 20:03:46 2021 +0200
+++ b/tests/run-tests.py	Sat Jul 10 01:57:35 2021 +0200
@@ -3185,6 +3185,9 @@
             # output.
             osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
             osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
+        else:
+            # drop flag for hghave
+            osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)
         if self.options.rhg:
             self._hgcommand = b'rhg'
         elif self.options.with_rhg: