Mercurial > hg
comparison tests/run-tests.py @ 28880:f74eed3115fd
hghave: add "chg" flag to skip tests that can't be compatible with chg
Several tests fail with chg for several reasons such as loaded chgserver
extension, running uisetup() per server instead of per runcommand, etc.
Since these tests can't/shouldn't be changed to be chg friendly, we need
a flag to skip them.
This patch explicitly drops CHGHG environment if chg isn't involved. This
way, hghave can just check if CHGHG exists.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 20 Mar 2016 14:55:56 -0700 |
parents | 65fb87479792 |
children | c969c72d6cbc |
comparison
equal
deleted
inserted
replaced
28879:8c1759a2bdf4 | 28880:f74eed3115fd |
---|---|
2062 | 2062 |
2063 # set CHGHG, then replace "hg" command by "chg" | 2063 # set CHGHG, then replace "hg" command by "chg" |
2064 chgbindir = self._bindir | 2064 chgbindir = self._bindir |
2065 if self.options.chg or self.options.with_chg: | 2065 if self.options.chg or self.options.with_chg: |
2066 osenvironb[b'CHGHG'] = os.path.join(self._bindir, self._hgcommand) | 2066 osenvironb[b'CHGHG'] = os.path.join(self._bindir, self._hgcommand) |
2067 else: | |
2068 osenvironb.pop(b'CHGHG', None) # drop flag for hghave | |
2067 if self.options.chg: | 2069 if self.options.chg: |
2068 self._hgcommand = b'chg' | 2070 self._hgcommand = b'chg' |
2069 elif self.options.with_chg: | 2071 elif self.options.with_chg: |
2070 chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg)) | 2072 chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg)) |
2071 self._hgcommand = os.path.basename(self.options.with_chg) | 2073 self._hgcommand = os.path.basename(self.options.with_chg) |