D577: run-tests: extract prefix of bisect commands to a variable
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Aug 30 22:36:49 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This does not change any logic.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D577
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -2070,15 +2070,16 @@
savetimes(self._runner._outputdir, result)
if failed and self._runner.options.known_good_rev:
+ bisectcmd = ['hg', 'bisect']
def nooutput(args):
p = subprocess.Popen(args, stderr=subprocess.STDOUT,
stdout=subprocess.PIPE)
p.stdout.read()
p.wait()
for test, msg in result.failures:
- nooutput(['hg', 'bisect', '--reset']),
- nooutput(['hg', 'bisect', '--bad', '.'])
- nooutput(['hg', 'bisect', '--good',
+ nooutput(bisectcmd + ['--reset']),
+ nooutput(bisectcmd + ['--bad', '.'])
+ nooutput(bisectcmd + ['--good',
self._runner.options.known_good_rev])
# TODO: we probably need to forward more options
# that alter hg's behavior inside the tests.
@@ -2088,7 +2089,7 @@
opts += ' --with-hg=%s ' % shellquote(withhg)
rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts,
test)
- sub = subprocess.Popen(['hg', 'bisect', '--command', rtc],
+ sub = subprocess.Popen(bisectcmd + ['--command', rtc],
stderr=subprocess.STDOUT,
stdout=subprocess.PIPE)
data = sub.stdout.read()
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list