Todd Lipcon has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/10106 )
Change subject: Modify fix_includes.py for Kudu usage, add a wrapper ...................................................................... Modify fix_includes.py for Kudu usage, add a wrapper This makes a few small changes to the upstream fix_includes.py script: - We name our tests 'foo-test.cc' instead of 'foo_test.cc'. Expands the regex appropriately. - Add support for 'IWYU pragma: keep' to avoid removing duplicate headers. Without this, it was attempting to remove the duplicate include in bitshuffle_arch_wrapper.cc which includes the bitshuffle header twice with different #defines - Adds a --blank_line_between_c_and_cxx_includes option which preserves the style that we use. - Adds support for differentiating between thirdparty <foo> includes versus system <foo> includes by checking for file existence in a set of directories passed on the command line. Google apparently uses quoted includes like "protobuf/foo.h" for this purpose whereas we use <>. This also adds a wrapper script build-support/iwyu.py which handles invoking IWYU and also integrating it with the modified fix_includes.py. This takes the place of the old 'iwyu.sh' and associated awk script. It supports automatically piping the IWYU results back through the include fixer and either producing a diff of errors (default output) or fixing them in-situ. Change-Id: I3c286271a39a0d825fb11e5610d8eb7e5b0729b9 Reviewed-on: http://gerrit.cloudera.org:8080/10106 Tested-by: Kudu Jenkins Reviewed-by: Adar Dembo <[email protected]> --- M CMakeLists.txt M README.adoc M build-support/build_source_release.py A build-support/iwyu.py A build-support/iwyu/__init__.py M build-support/iwyu/fix_includes.py D build-support/iwyu/iwyu-filter.awk D build-support/iwyu/iwyu.sh M build-support/kudu_util.py M build-support/release/rat_exclude_files.txt M src/kudu/cfile/bitshuffle_arch_wrapper.cc 11 files changed, 416 insertions(+), 254 deletions(-) Approvals: Kudu Jenkins: Verified Adar Dembo: Looks good to me, approved -- To view, visit http://gerrit.cloudera.org:8080/10106 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: kudu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c286271a39a0d825fb11e5610d8eb7e5b0729b9 Gerrit-Change-Number: 10106 Gerrit-PatchSet: 5 Gerrit-Owner: Todd Lipcon <[email protected]> Gerrit-Reviewer: Adar Dembo <[email protected]> Gerrit-Reviewer: Alexey Serbin <[email protected]> Gerrit-Reviewer: Dan Burkert <[email protected]> Gerrit-Reviewer: Kudu Jenkins Gerrit-Reviewer: Todd Lipcon <[email protected]>
