On Fri, Mar 1, 2019 at 4:00 PM Daniel Borkmann <dan...@iogearbox.net> wrote:
>
> On 03/01/2019 12:24 AM, Stanislav Fomichev wrote:
> > Recently we had linux-next bpf/bpf-next conflict when we added new
> > functionality to the test_progs.c at the same location. Let's split
> > test_progs.c the same way we recently split test_verifier.c.
> >
> > I follow the same patten we did in commit 2dfb40121ee8 ("selftests: bpf:
> > prepare for break up of verifier tests") for verifier: create
> > scaffolding to support dedicated files and slowly move the tests into
> > separate files.
> >
> > The first patch adds scaffolding, subsequent patches move progs into
> > separate files.
> >
> > In theory, many of the standalone tests can be migrated to this new
> > framework as well. They get the benefit of common CHECK macro and
> > bpf_find_map function which a lot of standalone tests need to redefine.
> >
> > v2 changes:
> > * added cover letter, added more description about file structure
> >
> > Stanislav Fomichev (7):
> > selftests: bpf: break up test_progs - preparations
> > selftests: bpf: break up test_progs - pkt access
> > selftests: bpf: break up test_progs - xdp
> > selftests: bpf: break up test_progs - stackmap
> > selftests: bpf: break up test_progs - tracepoint
> > selftests: bpf: break up test_progs - spinlock
> > selftests: bpf: break up test_progs - misc
>
> Looks good, thanks for bringing some structure into selftests! Series
> failed to apply cleanly on the last patch though:
>
> Switched to a new branch 'bpf-split-prog-tests'
> Applying: selftests: bpf: break up test_progs - preparations
> Applying: selftests: bpf: break up test_progs - pkt access
> Applying: selftests: bpf: break up test_progs - xdp
> Applying: selftests: bpf: break up test_progs - stackmap
> Applying: selftests: bpf: break up test_progs - tracepoint
> Applying: selftests: bpf: break up test_progs - spinlock
> Applying: selftests: bpf: break up test_progs - misc
> fatal: sha1 information is lacking or useless
> (tools/testing/selftests/bpf/test_progs.c).
> error: could not build fake ancestor
>
> Last commit in that file before this series is your ebace0e981b2
> ("selftests/bpf: use __bpf_constant_htons in test_prog.c for flow
> dissector"), please respin with a fresh rebase.
Ah, sorry about that, will respin later today.
> Thanks,
> Daniel
