comparison 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
comparison
equal deleted inserted replaced
36676:c6a61298ac32 36677:a247a0e82e7d
1371 l += b'\n' 1371 l += b'\n'
1372 if l.startswith(b'#require'): 1372 if l.startswith(b'#require'):
1373 lsplit = l.split() 1373 lsplit = l.split()
1374 if len(lsplit) < 2 or lsplit[0] != b'#require': 1374 if len(lsplit) < 2 or lsplit[0] != b'#require':
1375 after.setdefault(pos, []).append(' !!! invalid #require\n') 1375 after.setdefault(pos, []).append(' !!! invalid #require\n')
1376 haveresult, message = self._hghave(lsplit[1:]) 1376 if not skipping:
1377 if not haveresult: 1377 haveresult, message = self._hghave(lsplit[1:])
1378 script = [b'echo "%s"\nexit 80\n' % message] 1378 if not haveresult:
1379 break 1379 script = [b'echo "%s"\nexit 80\n' % message]
1380 break
1380 after.setdefault(pos, []).append(l) 1381 after.setdefault(pos, []).append(l)
1381 elif l.startswith(b'#if'): 1382 elif l.startswith(b'#if'):
1382 lsplit = l.split() 1383 lsplit = l.split()
1383 if len(lsplit) < 2 or lsplit[0] != b'#if': 1384 if len(lsplit) < 2 or lsplit[0] != b'#if':
1384 after.setdefault(pos, []).append(' !!! invalid #if\n') 1385 after.setdefault(pos, []).append(' !!! invalid #if\n')