# HG changeset patch # User Pierre-Yves David # Date 2021-07-09 23:57:35 # Node ID 5654323832f07ea979f042b9746f1d5d94780fc0 # Parent ee1fc8f970e6668f7b9eb3e837fbcb9222ccad83 run-tests: drop the `rhg` flag for `hghave.py` if unset This seems cleaner. Differential Revision: https://phab.mercurial-scm.org/D11050 diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -3185,6 +3185,9 @@ class TestRunner(object): # 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: