diff options
| author | fanquake <fanquake@gmail.com> | 2023-02-02 15:47:52 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-02 15:48:20 +0000 |
| commit | c2028f98aec397ff239db09d8e1835f13fa18208 (patch) | |
| tree | f17e5770347e219f4ffe06d669b294091d347203 /ci/test | |
| parent | b3ef3291993da920154a0e26d38782e90f1ed9f6 (diff) | |
| parent | fa6986a66b451f532a1aa2bd72c956fcd8c0d042 (diff) | |
Merge bitcoin/bitcoin#27012: ci: Print iwyu patch in git diff format
fa6986a66b451f532a1aa2bd72c956fcd8c0d042 ci: Print iwyu patch in git diff format (MarcoFalke)
Pull request description:
Seems more dev friendly to also have a patch to copy-paste
ACKs for top commit:
hebasto:
ACK fa6986a66b451f532a1aa2bd72c956fcd8c0d042, tested on Ubuntu 22.04 locally.
fanquake:
ACK fa6986a66b451f532a1aa2bd72c956fcd8c0d042 - did not test but example CI output looks ok.
stickies-v:
utACK fa6986a66b451f532a1aa2bd72c956fcd8c0d042
Tree-SHA512: 7cfd8584bf12e03c28af23f4712c6bcafd648d87ddb92788b9cd35455b2db49f4bd4aef8ad4711f75c7f11ad2bb2492c2eb6044007086c20e36016575c060603
Diffstat (limited to 'ci/test')
| -rwxr-xr-x | ci/test/06_script_b.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 6c247abebe..49cc48aa15 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -75,7 +75,12 @@ if [ "${RUN_TIDY}" = "true" ]; then " src/util/syserror.cpp"\ " src/util/threadinterrupt.cpp"\ " src/zmq"\ - " -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" + " -p . ${MAKEJOBS}"\ + " -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"\ + " |& tee /tmp/iwyu_ci.out" + export P_CI_DIR="${BASE_ROOT_DIR}/src" + CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out" + CI_EXEC "git --no-pager diff" fi if [ "$RUN_SECURITY_TESTS" = "true" ]; then |