cocci: split off include-less "tests" from SPATCH_FLAGS

Amend the "coccicheck-test" rule added in f7ff6597a75 (cocci: add a "coccicheck-test" target and test *.cocci rules, 2022-07-05) to stop using "--all-includes". The flags we'll need for the tests are different than the ones we'll need for our main source code. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Ævar Arnfjörð Bjarmason committed Nov 1, 2022 at 23:35 UTC b75f2701c6a34fb35b9736368716dde61dc51def
1 file changed +3 -1
Makefile
+3 -1
@@ -1296,6 +1296,7 @@ SANITIZE_ADDRESS =
1296
1297 # For the 'coccicheck' target
1298 SPATCH_FLAGS = --all-includes
1299 +SPATCH_TEST_FLAGS =
1300 # Setting SPATCH_BATCH_SIZE higher will
1301 # usually result in less CPU usage at the cost of higher peak memory.
1302 # Setting it to 0 will feed all files in a single spatch invocation.
@@ -1305,6 +1306,7 @@ SPATCH_BATCH_SIZE = 1
1306 TRACK_SPATCH_DEFINES =
1307 TRACK_SPATCH_DEFINES += $(SPATCH)
1308 TRACK_SPATCH_DEFINES += $(SPATCH_FLAGS)
1309 +TRACK_SPATCH_DEFINES += $(SPATCH_TEST_FLAGS)
1310 TRACK_SPATCH_DEFINES += $(SPATCH_BATCH_SIZE)
1311 GIT-SPATCH-DEFINES: FORCE
1312 @FLAGS='$(TRACK_SPATCH_DEFINES)'; \
@@ -3193,7 +3195,7 @@ $(COCCI_TEST_RES_GEN): .build/%.res : %.c
3195 $(COCCI_TEST_RES_GEN): .build/%.res : %.res
3196 $(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : contrib/coccinelle/%.cocci
3197 $(call mkdir_p_parent_template)
3196 - $(QUIET_SPATCH_TEST)$(SPATCH) $(SPATCH_FLAGS) \
3198 + $(QUIET_SPATCH_TEST)$(SPATCH) $(SPATCH_TEST_FLAGS) \
3199 --very-quiet --no-show-diff \
3200 --sp-file $< -o $@ \
3201 $(@:.build/%.res=%.c) && \