| Message ID | 20240216-bpf-selftests-custom-progs-v1-1-f7cf281a1fda@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7648f0c91eaa3598add9e91991a5483b29da32ee |
| Headers | show |
| Series | [bpf-next] selftests: bpf: Remove empty TEST_CUSTOM_PROGS | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Fri, 16 Feb 2024 09:42:45 -0300 you wrote: > Commit f04a32b2c5b5 ("selftests/bpf: Do not use sign-file as testcase") > removed the TEST_CUSTOM_PROGS assignment, and removed it from being used > on TEST_GEN_FILES. Remove two leftovers from that cleanup. > > Found by inspection. > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > > [...] Here is the summary with links: - [bpf-next] selftests: bpf: Remove empty TEST_CUSTOM_PROGS https://git.kernel.org/bpf/bpf-next/c/7648f0c91eaa You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index a38a3001527c..d9029d44b8f2 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -197,8 +197,7 @@ endif # NOTE: Semicolon at the end is critical to override lib.mk's default static # rule for binaries. $(notdir $(TEST_GEN_PROGS) \ - $(TEST_GEN_PROGS_EXTENDED) \ - $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ; + $(TEST_GEN_PROGS_EXTENDED)): %: $(OUTPUT)/% ; # sort removes libbpf duplicates when not cross-building MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf \ @@ -752,7 +751,7 @@ $(OUTPUT)/uprobe_multi: uprobe_multi.c $(call msg,BINARY,,$@) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ -EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ +EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ prog_tests/tests.h map_tests/tests.h verifier/tests.h \ feature bpftool \ $(addprefix $(OUTPUT)/,*.o *.skel.h *.lskel.h *.subskel.h \
Commit f04a32b2c5b5 ("selftests/bpf: Do not use sign-file as testcase") removed the TEST_CUSTOM_PROGS assignment, and removed it from being used on TEST_GEN_FILES. Remove two leftovers from that cleanup. Found by inspection. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> --- tools/testing/selftests/bpf/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: 682158ab532a5bd24399fec25b65fec561f0f6e9 change-id: 20240215-bpf-selftests-custom-progs-220453b6cc8a Best regards,