Disabling header check for filegroups.

pull/8140/head
Nicolas "Pixel" Noble 8 years ago
parent 880b4578ab
commit 055b920828
  1. 20
      templates/tools/run_tests/sources_and_headers.json.template
  2. 4
      tools/run_tests/sanity/check_sources_and_headers.py
  3. 352
      tools/run_tests/sources_and_headers.json

@ -37,6 +37,7 @@
${json.dumps([{"name": tgt.name, ${json.dumps([{"name": tgt.name,
"type": typ, "type": typ,
"is_filegroup": False,
"language": tgt.language, "language": tgt.language,
"third_party": tgt.boringssl or tgt.zlib, "third_party": tgt.boringssl or tgt.zlib,
"src": sorted( "src": sorted(
@ -50,5 +51,22 @@
"deps": sorted(tgt.get('deps', []) + "deps": sorted(tgt.get('deps', []) +
tgt.get('uses', []) + tgt.get('uses', []) +
tgt.get('filegroups', []))} tgt.get('filegroups', []))}
for typ, tgt in all_targets(targets, libs, filegroups)], for typ, tgt in all_targets(targets, libs, [])] +
[{"name": tgt.name,
"type": typ,
"is_filegroup": True,
"language": tgt.language,
"third_party": tgt.boringssl or tgt.zlib,
"src": sorted(
filter_srcs(tgt.own_src, (no_protos_filter, no_third_party_filter)) +
filter_srcs(tgt.own_public_headers, (no_protos_filter, no_third_party_filter)) +
filter_srcs(tgt.own_headers, (no_third_party_filter,))),
"headers": sorted(
tgt.own_public_headers +
tgt.own_headers +
proto_headers(tgt.own_src)),
"deps": sorted(tgt.get('deps', []) +
tgt.get('uses', []) +
tgt.get('filegroups', []))}
for typ, tgt in all_targets([], [], filegroups)],
sort_keys=True, indent=2)} sort_keys=True, indent=2)}

@ -74,14 +74,14 @@ for target in js:
for line in src: for line in src:
m = re_inc1.match(line) m = re_inc1.match(line)
if m: if m:
if not target_has_header(target, m.group(1)): if not target_has_header(target, m.group(1)) and not target['is_filegroup']:
print ( print (
'target %s (%s) does not name header %s as a dependency' % ( 'target %s (%s) does not name header %s as a dependency' % (
target['name'], fn, m.group(1))) target['name'], fn, m.group(1)))
errors += 1 errors += 1
m = re_inc2.match(line) m = re_inc2.match(line)
if m: if m:
if not target_has_header(target, 'include/' + m.group(1)): if not target_has_header(target, 'include/' + m.group(1)) and not target['is_filegroup']:
print ( print (
'target %s (%s) does not name header %s as a dependency' % ( 'target %s (%s) does not name header %s as a dependency' % (
target['name'], fn, m.group(1))) target['name'], fn, m.group(1)))

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save