Skip to content

tests: check: use find_program for iwyu_tool #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jordalgo wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −8
Draft

tests: check: use find_program for iwyu_tool #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/fedora-43.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN dnf --disablerepo=* --enablerepo=fedora,updates --nodocs --setopt=install_we
python3-linuxdoc \
python3-scapy \
python3-sphinx \
include-what-you-use \
sed \
xxd && \
dnf clean all -y
6 changes: 6 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ jobs:
run: ctest --test-dir $GITHUB_WORKSPACE/build -L integration --verbose
- name: Run checks
run: ctest --test-dir $GITHUB_WORKSPACE/build -L check --verbose

- name: Run IWYU
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build-iwyu -DWITH_IWYU=1 -DNO_BENCHMARKS=1
make -C $GITHUB_WORKSPACE/build-iwyu -j `nproc`
- name: Generate the coverage report
run: make -C $GITHUB_WORKSPACE/build coverage

Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ option(NO_TESTS "Disable unit, end-to-end, and integration tests" 0)
option(NO_CHECKS "Disable the check target (clang-tidy and clang-format" 0)
option(NO_BENCHMARKS "Disable the benchmark" 0)
option(WITH_COVERAGE "Build with code coverage support. Disabled by default" 0)
option(WITH_IWYU "Build with include-what-you-use checks. Disabled by default" 0)

if (WITH_IWYU)
find_program(IWYU_BIN NAMES include-what-you-use iwyu REQUIRED)
set(CMAKE_C_INCLUDE_WHAT_YOU_USE "${IWYU_BIN};-Xiwyu;--error")
endif ()

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

Expand Down
9 changes: 1 addition & 8 deletions tests/check/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ add_test(NAME "check.lint"
${bf_srcs}
)

add_test(NAME "check.iwyu"
COMMAND
/usr/bin/iwyu_tool.py
-p ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/libbpfilter/cgen/program.c
)

set_tests_properties("check.lint" PROPERTIES
LABELS "check"
Comment thread
jordalgo marked this conversation as resolved.
)
Expand Down Expand Up @@ -63,4 +56,4 @@ add_custom_target(fixstyle
add_custom_target(check
COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -L check
COMMENT "Running check tests"
)
)
Loading