Skip to content

Commit 61098e8

Browse files
anakryikoAlexei Starovoitov
authored andcommitted
selftests/bpf: prevent headers to be compiled as C code
Apprently listing header as a normal dependency for a binary output makes it go through compilation as if it was C code. This currently works without a problem, but in subsequent commits causes problems for differently generated test.h for test_progs. Marking those headers as order-only dependency solves the issue. Signed-off-by: Andrii Nakryiko <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 943e398 commit 61098e8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/testing/selftests/bpf/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ PROG_TESTS_H := $(PROG_TESTS_DIR)/tests.h
235235
PROG_TESTS_FILES := $(wildcard prog_tests/*.c)
236236
test_progs.c: $(PROG_TESTS_H)
237237
$(OUTPUT)/test_progs: CFLAGS += $(TEST_PROGS_CFLAGS)
238-
$(OUTPUT)/test_progs: test_progs.c $(PROG_TESTS_H) $(PROG_TESTS_FILES)
238+
$(OUTPUT)/test_progs: test_progs.c $(PROG_TESTS_FILES) | $(PROG_TESTS_H)
239239
$(PROG_TESTS_H): $(PROG_TESTS_FILES) | $(PROG_TESTS_DIR)
240240
$(shell ( cd prog_tests/; \
241241
echo '/* Generated header, do not edit */'; \
@@ -256,7 +256,7 @@ MAP_TESTS_H := $(MAP_TESTS_DIR)/tests.h
256256
MAP_TESTS_FILES := $(wildcard map_tests/*.c)
257257
test_maps.c: $(MAP_TESTS_H)
258258
$(OUTPUT)/test_maps: CFLAGS += $(TEST_MAPS_CFLAGS)
259-
$(OUTPUT)/test_maps: test_maps.c $(MAP_TESTS_H) $(MAP_TESTS_FILES)
259+
$(OUTPUT)/test_maps: test_maps.c $(MAP_TESTS_FILES) | $(MAP_TESTS_H)
260260
$(MAP_TESTS_H): $(MAP_TESTS_FILES) | $(MAP_TESTS_DIR)
261261
$(shell ( cd map_tests/; \
262262
echo '/* Generated header, do not edit */'; \
@@ -277,7 +277,7 @@ VERIFIER_TESTS_H := $(VERIFIER_TESTS_DIR)/tests.h
277277
VERIFIER_TEST_FILES := $(wildcard verifier/*.c)
278278
test_verifier.c: $(VERIFIER_TESTS_H)
279279
$(OUTPUT)/test_verifier: CFLAGS += $(TEST_VERIFIER_CFLAGS)
280-
$(OUTPUT)/test_verifier: test_verifier.c $(VERIFIER_TESTS_H)
280+
$(OUTPUT)/test_verifier: test_verifier.c | $(VERIFIER_TEST_FILES) $(VERIFIER_TESTS_H)
281281
$(VERIFIER_TESTS_H): $(VERIFIER_TEST_FILES) | $(VERIFIER_TESTS_DIR)
282282
$(shell ( cd verifier/; \
283283
echo '/* Generated header, do not edit */'; \

0 commit comments

Comments
 (0)