On Thu, Apr 27, 2023 at 10:38:50PM +0200, Daniel Borkmann wrote:
> On 4/27/23 8:28 PM, Stanislav Fomichev wrote:
> > On 04/27, Alexey Gladkov wrote:
> >> The sign-file utility (from scripts/) is used in prog_tests/verify_pkcs7_sig.c,
> >> but the utility should not be called as a test. Executing this utility
> >> produces the following error:
> >>
> >> selftests: /linux/tools/testing/selftests/bpf: urandom_read
> >> ok 16 selftests: /linux/tools/testing/selftests/bpf: urandom_read
> >>
> >> selftests: /linux/tools/testing/selftests/bpf: sign-file
> >> not ok 17 selftests: /linux/tools/testing/selftests/bpf: sign-file # exit=2
> >>
> >> Fixes: fc97590668ae ("selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc")
> >> Signed-off-by: Alexey Gladkov <legion@xxxxxxxxxx>
> >
> > Acked-by: Stanislav Fomichev <sdf@xxxxxxxxxx>
> >
> >> tools/testing/selftests/bpf/Makefile | 3 +--
> >> 1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> >> index b677dcd0b77a..fd214d1526d4 100644
> >> --- a/tools/testing/selftests/bpf/Makefile
> >> +++ b/tools/testing/selftests/bpf/Makefile
> >> @@ -88,8 +88,7 @@ TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \
> >> xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \
> >> xdp_features
> >>
> >> -TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read $(OUTPUT)/sign-file
> >> -TEST_GEN_FILES += liburandom_read.so
> >> +TEST_GEN_FILES += liburandom_read.so urandom_read sign-file
>
> Given you move over both of them, the commit msg should be adapted accordingly
> since it mainly talks about sign-file, less so about urandom_read.
I mentioned urandom_read only in the example of output because this
utility is less critical. Although it is mistakenly used as a test, it
does not lead to an error.
First I found sign-file and only then I noticed that urandom_read is not a
test either.
> Also now that you remove the TEST_CUSTOM_PROGS, we should probably also remove
> the other two instances:
>
> tools/testing/selftests/bpf/Makefile:91:TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read $(OUTPUT)/sign-file
My patch just changed it.
> tools/testing/selftests/bpf/Makefile:156: $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ;
> tools/testing/selftests/bpf/Makefile:674:EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \
I thought about it.
According to the documentation TEST_CUSTOM_PROGS should be used by tests
that require custom build rule and common prevent build rule use.
These rules provide a custom build of utilities. Therefore, I left it
unchanged in case such tests actually appear.
> >> # Emit succinct information message describing current building step
> >> # $1 - generic step name (e.g., CC, LINK, etc);
> >> --
> >> 2.33.7
> >>
>
--
Rgrds, legion
