gclient: fix recursedeps tuple/list validation for chromeos

Bug: 727685, 570091
Change-Id: I97a99d15930c1662c0ecfacd3755af27b282f686
Reviewed-on: https://chromium-review.googlesource.com/517800
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Paul Hobbs <phobbs@google.com>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
changes/00/517800/2
Paweł Hajdan, Jr 8 years ago committed by Commit Bot
parent 1101645d53
commit 05fec0394f

@ -71,7 +71,11 @@ _GCLIENT_SCHEMA = schema.Schema({
# Whitelists deps for which recursion should be enabled.
schema.Optional('recursedeps'): [
schema.Optional(schema.Or(basestring, (basestring, basestring)))
schema.Optional(schema.Or(
basestring,
(basestring, basestring),
[basestring, basestring]
)),
],
# Blacklists directories for checking 'include_rules'.

@ -119,6 +119,13 @@ deps_os = {
gclient_eval.Check(
'include_rules = {}', '<string>', {}, {'include_rules': {}})
def test_recursedeps_list(self):
gclient_eval.Check(
'recursedeps = [["src/third_party/angle", "DEPS.chromium"]]',
'<string>',
{},
{'recursedeps': [['src/third_party/angle', 'DEPS.chromium']]})
if __name__ == '__main__':
level = logging.DEBUG if '-v' in sys.argv else logging.FATAL

Loading…
Cancel
Save