Commit 2dfb4012 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Alexei Starovoitov
Browse files

selftests: bpf: prepare for break up of verifier tests 



test_verifier.c has grown to be very long (almost 16 kLoC),
and it is very conflict prone since we always add tests at
the end.

Try to break it apart a little bit.  Allow test snippets
to be defined in separate files and include them automatically
into the huge test array.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarJiong Wang <jiong.wang@netronome.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ae575c8a

tools/testing/selftests/bpf/Makefile

+13 −0
Original line number Diff line number Diff line
@@ -212,4 +212,17 @@ ifeq ($(DWARF2BTF),y) 
	$(BTF_PAHOLE) -J $@

endif



$(OUTPUT)/test_verifier: $(OUTPUT)/verifier/tests.h

$(OUTPUT)/test_verifier: CFLAGS += -I$(OUTPUT)



VERIFIER_TEST_FILES := $(wildcard verifier/*.c)

$(OUTPUT)/verifier/tests.h: $(VERIFIER_TEST_FILES)

	$(shell ( cd verifier/

		  echo '/* Generated header, do not edit */'; \

		  echo '#ifdef FILL_ARRAY'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\(.*\)@#include \"\1\"@'; \

		  echo '#endif' \

		 ) > $(OUTPUT)/verifier/tests.h)



EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(ALU32_BUILD_DIR)

tools/testing/selftests/bpf/test_verifier.c

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ static void bpf_fill_rand_ld_dw(struct bpf_test *self) 
	BPF_ALU64_IMM(BPF_ARSH, BPF_REG_7, 32)



static struct bpf_test tests[] = {

#define FILL_ARRAY

#include <verifier/tests.h>

#undef FILL_ARRAY

	{

		"add+sub+mul",

		.insns = {

tools/testing/selftests/bpf/verifier/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
tests.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE