Skip to content

Commit 0d046cb

Browse files
committed
Merge branch 'jc/coccicheck-fails-make-when-it-fails'
"make coccicheck" succeeds even when spatch made suggestions, which has been updated to fail in such a case. * jc/coccicheck-fails-make-when-it-fails: coccicheck: fail "make" when it fails
2 parents 5e458c1 + 819d3a5 commit 0d046cb

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3468,11 +3468,14 @@ endif
34683468
coccicheck-test: $(COCCI_TEST_RES_GEN)
34693469

34703470
coccicheck: coccicheck-test
3471+
34713472
ifdef SPATCH_CONCAT_COCCI
3472-
coccicheck: contrib/coccinelle/ALL.cocci.patch
3473+
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = contrib/coccinelle/ALL.cocci.patch
34733474
else
3474-
coccicheck: $(COCCICHECK_PATCHES_INTREE)
3475+
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = $(COCCICHECK_PATCHES_INTREE)
34753476
endif
3477+
coccicheck: $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES)
3478+
! grep -q ^ $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES) /dev/null
34763479

34773480
# See contrib/coccinelle/README
34783481
coccicheck-pending: coccicheck-test

0 commit comments

Comments
 (0)