Skip to content

Commit 64022cb

Browse files
committed
build: add variable for custom cppcheck flags
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: na - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 56b35d1 commit 64022cb

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

tools/make/lib/lint/c/cppcheck.mk

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CPPCHECK_SUPPRESSIONS_LIST_BENCHMARKS ?= $(CONFIG_DIR)/cppcheck/suppressions.ben
3434
CPPCHECK_SUPPRESSIONS_LIST_TESTS_FIXTURES ?= $(CONFIG_DIR)/cppcheck/suppressions.tests_fixtures.txt
3535

3636
# Define the command-line options to use when invoking the cppcheck executable:
37-
CPPCHECK_FLAGS ?= \
37+
CPPCHECK_DEFAULT_FLAGS ?= \
3838
--std=c99 \
3939
--enable=warning,style,performance,portability,information,missingInclude \
4040
--inconclusive \
@@ -45,6 +45,9 @@ CPPCHECK_FLAGS ?= \
4545
--check-level=exhaustive \
4646
--quiet
4747

48+
# Additional flags that a user can set:
49+
CPPCHECK_FLAGS ?=
50+
4851

4952
# RULES #
5053

@@ -106,13 +109,13 @@ ifeq ($(FAIL_FAST), true)
106109
$(QUIET) $(FIND_C_SOURCES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
107110
echo ''; \
108111
echo "Linting file: $$file"; \
109-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || exit 1; \
112+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || exit 1; \
110113
done
111114
else
112115
$(QUIET) $(FIND_C_SOURCES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
113116
echo ''; \
114117
echo "Linting file: $$file"; \
115-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || echo 'Linting failed.'; \
118+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || echo 'Linting failed.'; \
116119
done
117120
endif
118121

@@ -142,13 +145,13 @@ ifeq ($(FAIL_FAST), true)
142145
$(QUIET) $(FIND_C_EXAMPLES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
143146
echo ''; \
144147
echo "Linting file: $$file"; \
145-
$(CPPCHECK) $(CPPCHECK_FLAGS) --enable=unusedFunction --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_EXAMPLES) $$file || exit 1; \
148+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --enable=unusedFunction --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_EXAMPLES) $$file || exit 1; \
146149
done
147150
else
148151
$(QUIET) $(FIND_C_EXAMPLES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
149152
echo ''; \
150153
echo "Linting file: $$file"; \
151-
$(CPPCHECK) $(CPPCHECK_FLAGS) --enable=unusedFunction --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_EXAMPLES) $$file || echo 'Linting failed.'; \
154+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --enable=unusedFunction --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_EXAMPLES) $$file || echo 'Linting failed.'; \
152155
done
153156
endif
154157

@@ -178,13 +181,13 @@ ifeq ($(FAIL_FAST), true)
178181
$(QUIET) $(FIND_C_BENCHMARKS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
179182
echo ''; \
180183
echo "Linting file: $$file"; \
181-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_BENCHMARKS) $$file || exit 1; \
184+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_BENCHMARKS) $$file || exit 1; \
182185
done
183186
else
184187
$(QUIET) $(FIND_C_BENCHMARKS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
185188
echo ''; \
186189
echo "Linting file: $$file"; \
187-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_BENCHMARKS) $$file || echo 'Linting failed.'; \
190+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_BENCHMARKS) $$file || echo 'Linting failed.'; \
188191
done
189192
endif
190193

@@ -214,13 +217,13 @@ ifeq ($(FAIL_FAST), true)
214217
$(QUIET) $(FIND_C_TESTS_FIXTURES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
215218
echo ''; \
216219
echo "Linting file: $$file"; \
217-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_TESTS_FIXTURES) $$file || exit 1; \
220+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_TESTS_FIXTURES) $$file || exit 1; \
218221
done
219222
else
220223
$(QUIET) $(FIND_C_TESTS_FIXTURES_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
221224
echo ''; \
222225
echo "Linting file: $$file"; \
223-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_TESTS_FIXTURES) $$file || echo 'Linting failed.'; \
226+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST_TESTS_FIXTURES) $$file || echo 'Linting failed.'; \
224227
done
225228
endif
226229

@@ -247,13 +250,13 @@ ifeq ($(FAIL_FAST), true)
247250
$(QUIET) for file in $(FILES); do \
248251
echo ''; \
249252
echo "Linting file: $$file"; \
250-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || exit 1; \
253+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || exit 1; \
251254
done
252255
else
253256
$(QUIET) for file in $(FILES); do \
254257
echo ''; \
255258
echo "Linting file: $$file"; \
256-
$(CPPCHECK) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || echo 'Linting failed.'; \
259+
$(CPPCHECK) $(CPPCHECK_DEFAULT_FLAGS) $(CPPCHECK_FLAGS) --suppressions-list=$(CPPCHECK_SUPPRESSIONS_LIST) $$file || echo 'Linting failed.'; \
257260
done
258261
endif
259262

0 commit comments

Comments
 (0)