Commit 03506297 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

selftests/bpf: Improve bpftool changes detection 



Detect when bpftool source code changes and trigger rebuild within
selftests/bpf Makefile. Also fix few small formatting problems.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/bpf/20200124054148.2455060-1-andriin@fb.com
parent 1a6fa106

tools/testing/selftests/bpf/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -155,12 +155,13 @@ $(OUTPUT)/test_sysctl: cgroup_helpers.c 


DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool

BPFTOOL ?= $(DEFAULT_BPFTOOL)

$(DEFAULT_BPFTOOL): $(BPFOBJ) | $(BUILD_DIR)/bpftool

$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)    \

		    $(BPFOBJ) | $(BUILD_DIR)/bpftool

	$(Q)$(MAKE) $(submake_extras)  -C $(BPFTOOLDIR)			       \

		    OUTPUT=$(BUILD_DIR)/bpftool/			       \

		    prefix= DESTDIR=$(SCRATCH_DIR)/ install



$(BPFOBJ): $(wildcard $(BPFDIR)/*.c $(BPFDIR)/*.h $(BPFDIR)/Makefile)          \

$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \

	   ../../../include/uapi/linux/bpf.h                                   \

	   | $(INCLUDE_DIR) $(BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \

CRA Git | Maintained and supported by SUSTech CRA and CCSE