Skip to content

Commit ddddf49

Browse files
author
MarcoFalke
committed
ci: Run iwyu on all src files
This makes it easier to look at the CI output of a file without having to manually add it first.
1 parent 9d85c03 commit ddddf49

File tree

2 files changed

+9
-44
lines changed

2 files changed

+9
-44
lines changed

ci/test/00_setup_env_native_tidy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="ubuntu:lunar" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
1010
export CONTAINER_NAME=ci_native_tidy
11-
export PACKAGES="clang-16 libclang-16-dev llvm-16-dev libomp-16-dev clang-tidy-16 bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
11+
export PACKAGES="clang-16 libclang-16-dev llvm-16-dev libomp-16-dev clang-tidy-16 jq bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
1212
export NO_DEPENDS=1
1313
export RUN_UNIT_TESTS=false
1414
export RUN_FUNCTIONAL_TESTS=false

ci/test/06_script_b.sh

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,51 +42,16 @@ if [ "${RUN_TIDY}" = "true" ]; then
4242
set -eo pipefail
4343
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
4444
( run-clang-tidy-16 -quiet "${MAKEJOBS}" ) | grep -C5 "error"
45+
# Filter out files by regex here, because regex may not be
46+
# accepted in src/.bear-tidy-config
47+
# Filter out:
48+
# * qt qrc and moc generated files
49+
# * walletutil (temporarily)
50+
# * secp256k1
51+
jq 'map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$|src/wallet/walletutil|src/secp256k1/src/") | not))' ../compile_commands.json > tmp.json
52+
mv tmp.json ../compile_commands.json
4553
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/"
4654
python3 "${DIR_IWYU}/include-what-you-use/iwyu_tool.py" \
47-
src/common/args.cpp \
48-
src/common/config.cpp \
49-
src/common/init.cpp \
50-
src/common/url.cpp \
51-
src/compat \
52-
src/dbwrapper.cpp \
53-
src/init \
54-
src/kernel \
55-
src/node/blockmanager_args.cpp \
56-
src/node/chainstate.cpp \
57-
src/node/chainstatemanager_args.cpp \
58-
src/node/mempool_args.cpp \
59-
src/node/minisketchwrapper.cpp \
60-
src/node/utxo_snapshot.cpp \
61-
src/node/validation_cache_args.cpp \
62-
src/policy/feerate.cpp \
63-
src/policy/packages.cpp \
64-
src/policy/settings.cpp \
65-
src/primitives/transaction.cpp \
66-
src/random.cpp \
67-
src/rpc/fees.cpp \
68-
src/rpc/signmessage.cpp \
69-
src/test/fuzz/string.cpp \
70-
src/test/fuzz/txorphan.cpp \
71-
src/test/fuzz/util \
72-
src/test/util/coins.cpp \
73-
src/uint256.cpp \
74-
src/util/bip32.cpp \
75-
src/util/bytevectorhash.cpp \
76-
src/util/check.cpp \
77-
src/util/error.cpp \
78-
src/util/exception.cpp \
79-
src/util/getuniquepath.cpp \
80-
src/util/hasher.cpp \
81-
src/util/message.cpp \
82-
src/util/moneystr.cpp \
83-
src/util/serfloat.cpp \
84-
src/util/spanparsing.cpp \
85-
src/util/strencodings.cpp \
86-
src/util/string.cpp \
87-
src/util/syserror.cpp \
88-
src/util/threadinterrupt.cpp \
89-
src/zmq \
9055
-p . "${MAKEJOBS}" \
9156
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
9257
2>&1 | tee /tmp/iwyu_ci.out

0 commit comments

Comments
 (0)