Mercurial > public > mercurial-scm > hg
diff tests/run-tests.py @ 36677:a247a0e82e7d
run-tests: allow #require inside #if
Used by the next patch.
Differential Revision: https://phab.mercurial-scm.org/D2605
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Sat, 03 Mar 2018 12:39:14 -0800 |
| parents | 6276cbc704a6 |
| children | 5890e5872f36 |
line wrap: on
line diff
--- a/tests/run-tests.py Sat Mar 03 12:39:14 2018 -0800 +++ b/tests/run-tests.py Sat Mar 03 12:39:14 2018 -0800 @@ -1373,10 +1373,11 @@ lsplit = l.split() if len(lsplit) < 2 or lsplit[0] != b'#require': after.setdefault(pos, []).append(' !!! invalid #require\n') - haveresult, message = self._hghave(lsplit[1:]) - if not haveresult: - script = [b'echo "%s"\nexit 80\n' % message] - break + if not skipping: + haveresult, message = self._hghave(lsplit[1:]) + if not haveresult: + script = [b'echo "%s"\nexit 80\n' % message] + break after.setdefault(pos, []).append(l) elif l.startswith(b'#if'): lsplit = l.split()