Skip to content

Commit 46e9817

Browse files
committed
#9f616a9 add testmods in includes for cppcheck
1 parent 4ed1c7e commit 46e9817

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

_charm/src/9f616a92f60f1031684c77f16d033e9d3de80c177f181c35834192e7bd00cd09.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<links>
88
<link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
99
</links>
10-
<cf v="fred322 2025-07-11T14:19:03+02:00"/>
10+
<cf v="fred322 2025-07-11T18:06:28+02:00"/>
1111
</cr>

core/module-crules-cppcheck.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CPPCHECK_SUPPRESS+=unmatchedSuppression missingIncludeSystem
1818
CPPCHECK_EXTLIBS_SUPPRESS+=$(CPPCHECK_SUPPRESS)
1919
CPPCHECK_EXTLIBS_SUPPRESS+=missingOverride cstyleCast passedByValue uninitMemberVarPrivate unusedPrivateFunction duplInheritedMember
2020
CPPCHECK_EXTLIBS_SUPPRESS+=duplicateValueTernary operatorEqVarError unreadVariable uninitMemberVar virtualCallInConstructor constParameterPointer
21+
CPPCHECK_EXTLIBS_SUPPRESS+=constVariablePointer
2122

2223
CPPCHECK_ARGS+=--enable=all --inline-suppr --error-exitcode=1 --report-progress
2324
CPPCHECK_ARGS+=$(sort $(filter -D%,$(CXXFLAGS) $(CFLAGS)))
@@ -28,15 +29,15 @@ CPPCHECK_ARGS+=--suppressions-list=$(CPPCHECK_SUPPRESS_FILE)
2829
# generation of RES_HEADER if resources files are needed to generate res.h.
2930
$(CPPCHECK_INCLUDES_FILE): module.cfg $(PRJROOT)/app.cfg
3031
@echo "$(ABSROOT)/core/include" > $@.tmp
31-
@$(foreach mod,$(INCLUDE_PROJ_MODS) $(MODNAME),$(if $(wildcard $(PRJROOT)/$(mod)/include),echo $(PRJROOT)/$(mod)/include >> $@.tmp;))
32+
@$(foreach mod,$(sort $(INCLUDE_PROJ_MODS) $(INCLUDE_TESTMODS_PROJ) $(MODNAME)),$(if $(wildcard $(PRJROOT)/$(mod)/include),echo $(PRJROOT)/$(mod)/include >> $@.tmp;))
3233
@find -L $(wildcard $(EXTLIBDIR) $(NA_EXTLIBDIR) $(NDEXTLIBDIR) $(NDNA_EXTLIBDIR)) -maxdepth 3 -name include -type d >> $@.tmp
3334
@echo "$(TRDIR)/include" >> $@.tmp
3435
@mv $@.tmp $@
3536

3637
$(CPPCHECK_SUPPRESS_FILE): module.cfg $(PRJROOT)/app.cfg
3738
@$(foreach suppr,$(CPPCHECK_EXTLIBS_SUPPRESS),echo "$(suppr):$(PRJROOT)/build/extlib/*" >> $@.tmp;)
3839
@$(foreach suppr,$(CPPCHECK_SUPPRESS),echo $(suppr) >> $@.tmp;)
39-
@$(foreach mod,$(INCLUDE_PROJ_MODS),\
40+
@$(foreach mod,$(sort $(INCLUDE_PROJ_MODS) $(INCLUDE_TESTMODS_PROJ)),\
4041
$(foreach suppr,$(CPPCHECK_EXTLIBS_SUPPRESS),echo $(suppr):$(PRJROOT)/$(mod)/include/* >> $@.tmp;))
4142
@mv $@.tmp $@
4243

core/module-test.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ TSRCFILES=$(filter-out $(patsubst %,test/%,$(TDISABLE_SRC)),$(TALLSRCFILES))
6060
TCPPOBJS=$(patsubst test/%.cpp,$(OBJDIR)/test/%.o,$(filter %.cpp,$(TSRCFILES))) \
6161
$(patsubst test/%.c,$(OBJDIR)/test/%.o,$(filter %.c,$(TSRCFILES)))
6262

63+
INCLUDE_TESTMODS_PROJ=$(filter-out $(MODNAME),$(patsubst $(APPNAME)_%,%,$(filter $(PROJECT_INC_MODS),$(T_ALL_DEPENDENCIES))))
6364
# compiler options specific to test
64-
TCFLAGS+=$(patsubst %,-I$(PRJROOT)/%/include,$(patsubst $(APPNAME)_%,%,$(filter $(PROJECT_INC_MODS),$(T_ALL_DEPENDENCIES))))
65+
TCFLAGS+=$(patsubst %,-I$(PRJROOT)/%/include,$(INCLUDE_TESTMODS_PROJ))
6566

6667
# linker options specific to test
6768
TLDFLAGS+=-L$(TRDIR)/$(SODIR)

0 commit comments

Comments
 (0)