diff options
author | Craig Tiller <ctiller@google.com> | 2016-02-11 15:45:03 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-02-11 15:45:03 -0800 |
commit | c35e2c582fcb075b973856b3c09c1e91de4b7eae (patch) | |
tree | d9984547d4e1258037876d621f8deb6c5c43ec65 /templates/tools/run_tests | |
parent | c3602dc1cf79959237aa90350c5942097f37c90c (diff) |
Revert "Proto API for LB request/responses"
Diffstat (limited to 'templates/tools/run_tests')
-rw-r--r-- | templates/tools/run_tests/sources_and_headers.json.template | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template index 78363ff1fa..04802772af 100644 --- a/templates/tools/run_tests/sources_and_headers.json.template +++ b/templates/tools/run_tests/sources_and_headers.json.template @@ -12,27 +12,20 @@ out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h']) return out - def no_protos_filter(src): - return os.path.splitext(src)[1] != '.proto' - - def no_third_party_filter(src): - return not src.startswith('third_party/') - - def filter_srcs(srcs, filters): + def no_protos(src): out = [] - for s in srcs: - filter_passes = (f(s) for f in filters) - if all(filter_passes): - out.append(s) + for f in src: + if os.path.splitext(f)[1] != '.proto': + out.append(f) return out %> ${json.dumps([{"name": tgt.name, "language": tgt.language, "src": sorted( - filter_srcs(tgt.src, (no_protos_filter, no_third_party_filter)) + - filter_srcs(tgt.get('public_headers', []), (no_protos_filter, no_third_party_filter)) + - filter_srcs(tgt.get('headers', []), (no_third_party_filter,))), + no_protos(tgt.src) + + tgt.get('public_headers', []) + + tgt.get('headers', [])), "headers": sorted( tgt.get('public_headers', []) + tgt.get('headers', []) + |