aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-04 13:40:06 +0200
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-13 10:45:52 +0200
commitddddf4957b02c83ed9b6c46b35d8ae1e137889d2 (patch)
treea844fefa8c433de73237a371e962dd881f71971c /ci
parent9d85c03620bf660cfa7d13080f5c0b191579cbc3 (diff)
downloadbitcoin-ddddf4957b02c83ed9b6c46b35d8ae1e137889d2.tar.xz
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.
Diffstat (limited to 'ci')
-rwxr-xr-xci/test/00_setup_env_native_tidy.sh2
-rwxr-xr-xci/test/06_script_b.sh51
2 files changed, 9 insertions, 44 deletions
diff --git a/ci/test/00_setup_env_native_tidy.sh b/ci/test/00_setup_env_native_tidy.sh
index 2fa61b8465..5c642b0d96 100755
--- a/ci/test/00_setup_env_native_tidy.sh
+++ b/ci/test/00_setup_env_native_tidy.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
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).
export CONTAINER_NAME=ci_native_tidy
-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"
+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"
export NO_DEPENDS=1
export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index 369da6c764..482414d3cc 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -42,51 +42,16 @@ if [ "${RUN_TIDY}" = "true" ]; then
set -eo pipefail
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
( run-clang-tidy-16 -quiet "${MAKEJOBS}" ) | grep -C5 "error"
+ # Filter out files by regex here, because regex may not be
+ # accepted in src/.bear-tidy-config
+ # Filter out:
+ # * qt qrc and moc generated files
+ # * walletutil (temporarily)
+ # * secp256k1
+ jq 'map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$|src/wallet/walletutil|src/secp256k1/src/") | not))' ../compile_commands.json > tmp.json
+ mv tmp.json ../compile_commands.json
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/"
python3 "${DIR_IWYU}/include-what-you-use/iwyu_tool.py" \
- src/common/args.cpp \
- src/common/config.cpp \
- src/common/init.cpp \
- src/common/url.cpp \
- src/compat \
- src/dbwrapper.cpp \
- src/init \
- src/kernel \
- src/node/blockmanager_args.cpp \
- src/node/chainstate.cpp \
- src/node/chainstatemanager_args.cpp \
- src/node/mempool_args.cpp \
- src/node/minisketchwrapper.cpp \
- src/node/utxo_snapshot.cpp \
- src/node/validation_cache_args.cpp \
- src/policy/feerate.cpp \
- src/policy/packages.cpp \
- src/policy/settings.cpp \
- src/primitives/transaction.cpp \
- src/random.cpp \
- src/rpc/fees.cpp \
- src/rpc/signmessage.cpp \
- src/test/fuzz/string.cpp \
- src/test/fuzz/txorphan.cpp \
- src/test/fuzz/util \
- src/test/util/coins.cpp \
- src/uint256.cpp \
- src/util/bip32.cpp \
- src/util/bytevectorhash.cpp \
- src/util/check.cpp \
- src/util/error.cpp \
- src/util/exception.cpp \
- src/util/getuniquepath.cpp \
- src/util/hasher.cpp \
- src/util/message.cpp \
- src/util/moneystr.cpp \
- src/util/serfloat.cpp \
- src/util/spanparsing.cpp \
- src/util/strencodings.cpp \
- src/util/string.cpp \
- 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" \
2>&1 | tee /tmp/iwyu_ci.out