lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 129/274] selftests/bpf: Ensure test flavors use correct skeletons
    Date
    From: Andrii Nakryiko <andriin@fb.com>

    [ Upstream commit 76148faa161e7cfb2d7719f35b37d7db4f3f8596 ]

    Ensure that test runner flavors include their own skeletons from <flavor>/
    directory. Previously, skeletons generated for no-flavor test_progs were used.
    Apart from fixing correctness, this also makes it possible to compile only
    flavors individually:

    $ make clean && make test_progs-no_alu32
    ... now succeeds ...

    Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")
    Signed-off-by: Andrii Nakryiko <andriin@fb.com>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/bpf/20200429012111.277390-2-andriin@fb.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
    index 4e654d41c7af..01c95f8278c7 100644
    --- a/tools/testing/selftests/bpf/Makefile
    +++ b/tools/testing/selftests/bpf/Makefile
    @@ -324,7 +324,7 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \
    $(TRUNNER_BPF_SKELS) \
    $$(BPFOBJ) | $(TRUNNER_OUTPUT)
    $$(call msg,TEST-OBJ,$(TRUNNER_BINARY),$$@)
    - cd $$(@D) && $$(CC) $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F)
    + cd $$(@D) && $$(CC) -I. $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F)

    $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \
    %.c \
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:57    [W:4.792 / U:0.956 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site