selftests/bpf: Further clean up Makefile output
Further clean up Makefile output: - hide "entering directory" messages; - silvence sub-Make command echoing; - succinct MKDIR messages. Also remove few test binaries that are not produced anymore from .gitignore. Signed-off-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20200110051716.1591485-4-andriin@fb.com
This commit is contained in:
parent
6910d7d386
commit
965b9fee28
|
@ -22,11 +22,9 @@ get_cgroup_id_user
|
|||
test_skb_cgroup_id_user
|
||||
test_socket_cookie
|
||||
test_cgroup_storage
|
||||
test_select_reuseport
|
||||
test_flow_dissector
|
||||
flow_dissector_load
|
||||
test_netcnt
|
||||
test_section_names
|
||||
test_tcpnotify_user
|
||||
test_libbpf
|
||||
test_tcp_check_syncookie_user
|
||||
|
|
|
@ -83,9 +83,12 @@ TEST_CUSTOM_PROGS = urandom_read
|
|||
# $3 - target (assumed to be file); only file name will be emitted;
|
||||
# $4 - optional extra arg, emitted as-is, if provided.
|
||||
ifeq ($(V),1)
|
||||
Q =
|
||||
msg =
|
||||
else
|
||||
Q = @
|
||||
msg = @$(info $(1)$(if $(2), [$(2)]) $(notdir $(3)))$(if $(4), $(4))
|
||||
MAKEFLAGS += --no-print-directory
|
||||
endif
|
||||
|
||||
# override lib.mk's default rules
|
||||
|
@ -147,14 +150,14 @@ DEFAULT_BPFTOOL := $(OUTPUT)/tools/usr/local/sbin/bpftool
|
|||
BPFTOOL ?= $(DEFAULT_BPFTOOL)
|
||||
|
||||
$(DEFAULT_BPFTOOL): force
|
||||
$(MAKE) -C $(BPFTOOLDIR) DESTDIR=$(OUTPUT)/tools install
|
||||
$(Q)$(MAKE) -C $(BPFTOOLDIR) DESTDIR=$(OUTPUT)/tools install
|
||||
|
||||
$(BPFOBJ): force
|
||||
$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/
|
||||
$(Q)$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/
|
||||
|
||||
BPF_HELPERS := $(OUTPUT)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h)
|
||||
$(OUTPUT)/bpf_helper_defs.h: $(BPFOBJ)
|
||||
$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h
|
||||
$(Q)$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h
|
||||
|
||||
# Get Clang's default includes on this system, as opposed to those seen by
|
||||
# '-target bpf'. This fixes "missing" files on some architectures/distros,
|
||||
|
@ -253,6 +256,7 @@ define DEFINE_TEST_RUNNER_RULES
|
|||
ifeq ($($(TRUNNER_OUTPUT)-dir),)
|
||||
$(TRUNNER_OUTPUT)-dir := y
|
||||
$(TRUNNER_OUTPUT):
|
||||
$$(call msg, MKDIR,,$$@)
|
||||
mkdir -p $$@
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue