diff --git a/gclient_eval.py b/gclient_eval.py index a995db9e1e..1652eb7d30 100644 --- a/gclient_eval.py +++ b/gclient_eval.py @@ -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'. diff --git a/tests/gclient_eval_unittest.py b/tests/gclient_eval_unittest.py index 66c1b6e952..817f1c0072 100755 --- a/tests/gclient_eval_unittest.py +++ b/tests/gclient_eval_unittest.py @@ -119,6 +119,13 @@ deps_os = { gclient_eval.Check( 'include_rules = {}', '', {}, {'include_rules': {}}) + def test_recursedeps_list(self): + gclient_eval.Check( + 'recursedeps = [["src/third_party/angle", "DEPS.chromium"]]', + '', + {}, + {'recursedeps': [['src/third_party/angle', 'DEPS.chromium']]}) + if __name__ == '__main__': level = logging.DEBUG if '-v' in sys.argv else logging.FATAL