| Message ID | 20240127133327.1594026-2-bjorn@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [bpf-next,v3,1/2] selftests/bpf: Remove incorrect object path | expand |
Björn Töpel <bjorn@kernel.org> writes: > From: Björn Töpel <bjorn@rivosinc.com> > > Currently, "make install" does not install the required test_progs > "extra files" (e.g. kernel modules, helper shell scripts, etc.) for > the BPF machine flavors (e.g. cpuv4). > > Add the missing "extra files" dependencies to rsync, called from the > install target. > > Unfortunately, kselftest does not use bash as the default shell, so > the globbering is limited. Blindly enabling "SHELL:=/bin/bash" for the > Makefile breaks in other places. Workaround by explicitly call > "/bin/bash" to expand the file globbing. > > Signed-off-by: Björn Töpel <bjorn@rivosinc.com> > --- > v3: Do not use hardcoded file names (Andrii) > v2: Added btf_dump_test_case files > --- > tools/testing/selftests/bpf/Makefile | 29 +++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index 830a34f0aa37..d66c689f0f3c 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -605,14 +605,15 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ > json_writer.c \ > flow_dissector_load.h \ > ip_check_defrag_frags.h > -TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ > - $(OUTPUT)/liburandom_read.so \ > - $(OUTPUT)/xdp_synproxy \ > - $(OUTPUT)/sign-file \ > - $(OUTPUT)/uprobe_multi \ > - ima_setup.sh \ > - verify_sig_setup.sh \ > - $(wildcard progs/btf_dump_test_case_*.c) > +TRUNNER_PROGS_EXTRA_FILES:= $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ > + $(OUTPUT)/liburandom_read.so \ > + $(OUTPUT)/xdp_synproxy \ > + $(OUTPUT)/sign-file \ > + $(OUTPUT)/uprobe_multi \ > + ima_setup.sh \ > + verify_sig_setup.sh \ > + $(wildcard progs/btf_dump_test_case_*.c) > +TRUNNER_EXTRA_FILES := $(TRUNNER_PROGS_EXTRA_FILES) > TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE > TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS > $(eval $(call DEFINE_TEST_RUNNER,test_progs)) > @@ -740,11 +741,17 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ > # Delete partially updated (corrupted) files on error > .DELETE_ON_ERROR: > > +space := $(subst ,, ) > +comma := , > +EXTRA_FILES_GLOB := {$(subst $(space),$(comma),$(notdir $(TRUNNER_PROGS_EXTRA_FILES)))} > DEFAULT_INSTALL_RULE := $(INSTALL_RULE) > override define INSTALL_RULE > $(DEFAULT_INSTALL_RULE) > - @for DIR in $(TEST_INST_SUBDIRS); do \ > - mkdir -p $(INSTALL_PATH)/$$DIR; \ > - rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ > + @for DIR in $(TEST_INST_SUBDIRS); do \ > + mkdir -p $(INSTALL_PATH)/$$DIR; \ > + rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR; \ > + rsync -a --copy-unsafe-links \ > + $$(/bin/bash -c "echo $(OUTPUT)/$$DIR/$(EXTRA_FILE_GLOB)") \ Argh! Bad commit. EXTRA_FILE_GLOB should be EXTRA_FILES_GLOB. :-( LMK if you can fix it up, or if you want me to resubmit. Björn
Björn Töpel <bjorn@kernel.org> writes: > Björn Töpel <bjorn@kernel.org> writes: > >> From: Björn Töpel <bjorn@rivosinc.com> >> >> Currently, "make install" does not install the required test_progs >> "extra files" (e.g. kernel modules, helper shell scripts, etc.) for >> the BPF machine flavors (e.g. cpuv4). >> >> Add the missing "extra files" dependencies to rsync, called from the >> install target. >> >> Unfortunately, kselftest does not use bash as the default shell, so >> the globbering is limited. Blindly enabling "SHELL:=/bin/bash" for the >> Makefile breaks in other places. Workaround by explicitly call >> "/bin/bash" to expand the file globbing. >> >> Signed-off-by: Björn Töpel <bjorn@rivosinc.com> >> --- >> v3: Do not use hardcoded file names (Andrii) >> v2: Added btf_dump_test_case files >> --- >> tools/testing/selftests/bpf/Makefile | 29 +++++++++++++++++----------- >> 1 file changed, 18 insertions(+), 11 deletions(-) >> >> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile >> index 830a34f0aa37..d66c689f0f3c 100644 >> --- a/tools/testing/selftests/bpf/Makefile >> +++ b/tools/testing/selftests/bpf/Makefile >> @@ -605,14 +605,15 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ >> json_writer.c \ >> flow_dissector_load.h \ >> ip_check_defrag_frags.h >> -TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ >> - $(OUTPUT)/liburandom_read.so \ >> - $(OUTPUT)/xdp_synproxy \ >> - $(OUTPUT)/sign-file \ >> - $(OUTPUT)/uprobe_multi \ >> - ima_setup.sh \ >> - verify_sig_setup.sh \ >> - $(wildcard progs/btf_dump_test_case_*.c) >> +TRUNNER_PROGS_EXTRA_FILES:= $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ >> + $(OUTPUT)/liburandom_read.so \ >> + $(OUTPUT)/xdp_synproxy \ >> + $(OUTPUT)/sign-file \ >> + $(OUTPUT)/uprobe_multi \ >> + ima_setup.sh \ >> + verify_sig_setup.sh \ >> + $(wildcard progs/btf_dump_test_case_*.c) >> +TRUNNER_EXTRA_FILES := $(TRUNNER_PROGS_EXTRA_FILES) >> TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE >> TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS >> $(eval $(call DEFINE_TEST_RUNNER,test_progs)) >> @@ -740,11 +741,17 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ >> # Delete partially updated (corrupted) files on error >> .DELETE_ON_ERROR: >> >> +space := $(subst ,, ) >> +comma := , >> +EXTRA_FILES_GLOB := {$(subst $(space),$(comma),$(notdir $(TRUNNER_PROGS_EXTRA_FILES)))} >> DEFAULT_INSTALL_RULE := $(INSTALL_RULE) >> override define INSTALL_RULE >> $(DEFAULT_INSTALL_RULE) >> - @for DIR in $(TEST_INST_SUBDIRS); do \ >> - mkdir -p $(INSTALL_PATH)/$$DIR; \ >> - rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ >> + @for DIR in $(TEST_INST_SUBDIRS); do \ >> + mkdir -p $(INSTALL_PATH)/$$DIR; \ >> + rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR; \ >> + rsync -a --copy-unsafe-links \ >> + $$(/bin/bash -c "echo $(OUTPUT)/$$DIR/$(EXTRA_FILE_GLOB)") \ > > Argh! Bad commit. EXTRA_FILE_GLOB should be EXTRA_FILES_GLOB. :-( > > LMK if you can fix it up, or if you want me to resubmit. ...and bpftool is missing. I'll spin a v4. :-(
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 830a34f0aa37..d66c689f0f3c 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -605,14 +605,15 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ json_writer.c \ flow_dissector_load.h \ ip_check_defrag_frags.h -TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ - $(OUTPUT)/liburandom_read.so \ - $(OUTPUT)/xdp_synproxy \ - $(OUTPUT)/sign-file \ - $(OUTPUT)/uprobe_multi \ - ima_setup.sh \ - verify_sig_setup.sh \ - $(wildcard progs/btf_dump_test_case_*.c) +TRUNNER_PROGS_EXTRA_FILES:= $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ + $(OUTPUT)/liburandom_read.so \ + $(OUTPUT)/xdp_synproxy \ + $(OUTPUT)/sign-file \ + $(OUTPUT)/uprobe_multi \ + ima_setup.sh \ + verify_sig_setup.sh \ + $(wildcard progs/btf_dump_test_case_*.c) +TRUNNER_EXTRA_FILES := $(TRUNNER_PROGS_EXTRA_FILES) TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS $(eval $(call DEFINE_TEST_RUNNER,test_progs)) @@ -740,11 +741,17 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ # Delete partially updated (corrupted) files on error .DELETE_ON_ERROR: +space := $(subst ,, ) +comma := , +EXTRA_FILES_GLOB := {$(subst $(space),$(comma),$(notdir $(TRUNNER_PROGS_EXTRA_FILES)))} DEFAULT_INSTALL_RULE := $(INSTALL_RULE) override define INSTALL_RULE $(DEFAULT_INSTALL_RULE) - @for DIR in $(TEST_INST_SUBDIRS); do \ - mkdir -p $(INSTALL_PATH)/$$DIR; \ - rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ + @for DIR in $(TEST_INST_SUBDIRS); do \ + mkdir -p $(INSTALL_PATH)/$$DIR; \ + rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR; \ + rsync -a --copy-unsafe-links \ + $$(/bin/bash -c "echo $(OUTPUT)/$$DIR/$(EXTRA_FILE_GLOB)") \ + $(INSTALL_PATH)/$$DIR; \ done endef