Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78e00bd authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Daniel Borkmann
Browse files

selftests: bpf: fix compilation with out-of-tree $(OUTPUT) 



A bunch of related changes lumped together:
* Create prog_tests and verifier output directories; these don't exist with
  out-of-tree $(OUTPUT)
* Add missing -I (via separate TEST_{PROGS,VERIFIER}_CFLAGS) for the main tree
  ($(PWD) != $(OUTPUT) for out-of-tree)
* Add libbpf.a dependency for test_progs_32 (parallel make fails otherwise)
* Add missing "; \" after "cd" when generating test.h headers

Tested by:
$ alias m="make -s -j$(nproc)"
$ m -C tools/testing/selftests/bpf/ clean
$ m -C tools/lib/bpf/ clean
$ rm -rf xxx; mkdir xxx; m -C tools/testing/selftests/bpf/ OUTPUT=$PWD/xxx
$ m -C tools/testing/selftests/bpf/

Fixes: 3f306588 ("selftests: bpf: break up test_progs - preparations")
Fixes: 2dfb4012 ("selftests: bpf: prepare for break up of verifier tests")
Fixes: 3ef84346 ("selftests: bpf: makefile support sub-register code-gen test mode")
Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 17a90a78

tools/testing/selftests/bpf/Makefile

+23 −10
Original line number Original line Diff line number Diff line
@@ -153,6 +153,9 @@ endif 
endif

endif

endif

endif





TEST_PROGS_CFLAGS := -I. -I$(OUTPUT)

TEST_VERIFIER_CFLAGS := -I. -I$(OUTPUT) -Iverifier



ifneq ($(SUBREG_CODEGEN),)

ifneq ($(SUBREG_CODEGEN),)

ALU32_BUILD_DIR = $(OUTPUT)/alu32

ALU32_BUILD_DIR = $(OUTPUT)/alu32

TEST_CUSTOM_PROGS += $(ALU32_BUILD_DIR)/test_progs_32

TEST_CUSTOM_PROGS += $(ALU32_BUILD_DIR)/test_progs_32
@@ -162,13 +165,15 @@ $(ALU32_BUILD_DIR): 
$(ALU32_BUILD_DIR)/urandom_read: $(OUTPUT)/urandom_read

$(ALU32_BUILD_DIR)/urandom_read: $(OUTPUT)/urandom_read

	cp $< $@

	cp $< $@





$(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(ALU32_BUILD_DIR) \

$(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(OUTPUT)/libbpf.a\

						$(ALU32_BUILD_DIR) \

						$(ALU32_BUILD_DIR)/urandom_read

						$(ALU32_BUILD_DIR)/urandom_read

	$(CC) $(CFLAGS) -o $(ALU32_BUILD_DIR)/test_progs_32 $< \

	$(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) \

		trace_helpers.c prog_tests/*.c $(OUTPUT)/libbpf.a $(LDLIBS)

		-o $(ALU32_BUILD_DIR)/test_progs_32 \

		test_progs.c trace_helpers.c prog_tests/*.c \

		$(OUTPUT)/libbpf.a $(LDLIBS)





$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)

$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)

$(ALU32_BUILD_DIR)/test_progs_32: CFLAGS += -I$(OUTPUT)

$(ALU32_BUILD_DIR)/test_progs_32: prog_tests/*.c

$(ALU32_BUILD_DIR)/test_progs_32: prog_tests/*.c





$(ALU32_BUILD_DIR)/%.o: progs/%.c $(ALU32_BUILD_DIR) \

$(ALU32_BUILD_DIR)/%.o: progs/%.c $(ALU32_BUILD_DIR) \
@@ -202,12 +207,16 @@ endif 




PROG_TESTS_H := $(OUTPUT)/prog_tests/tests.h

PROG_TESTS_H := $(OUTPUT)/prog_tests/tests.h

$(OUTPUT)/test_progs: $(PROG_TESTS_H)

$(OUTPUT)/test_progs: $(PROG_TESTS_H)

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

$(OUTPUT)/test_progs: CFLAGS += $(TEST_PROGS_CFLAGS)

$(OUTPUT)/test_progs: prog_tests/*.c

$(OUTPUT)/test_progs: prog_tests/*.c





PROG_TESTS_DIR = $(OUTPUT)/prog_tests

$(PROG_TESTS_DIR):

	mkdir -p $@



PROG_TESTS_FILES := $(wildcard prog_tests/*.c)

PROG_TESTS_FILES := $(wildcard prog_tests/*.c)

$(PROG_TESTS_H): $(PROG_TESTS_FILES)

$(PROG_TESTS_H): $(PROG_TESTS_DIR) $(PROG_TESTS_FILES)

	$(shell ( cd prog_tests/

	$(shell ( cd prog_tests/; \

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

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

		  echo '#ifdef DECLARE'; \

		  echo '#ifdef DECLARE'; \

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

		  ls *.c 2> /dev/null | \
@@ -221,11 +230,15 @@ $(PROG_TESTS_H): $(PROG_TESTS_FILES) 




VERIFIER_TESTS_H := $(OUTPUT)/verifier/tests.h

VERIFIER_TESTS_H := $(OUTPUT)/verifier/tests.h

$(OUTPUT)/test_verifier: $(VERIFIER_TESTS_H)

$(OUTPUT)/test_verifier: $(VERIFIER_TESTS_H)

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

$(OUTPUT)/test_verifier: CFLAGS += $(TEST_VERIFIER_CFLAGS)



VERIFIER_TESTS_DIR = $(OUTPUT)/verifier

$(VERIFIER_TESTS_DIR):

	mkdir -p $@





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

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

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

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

	$(shell ( cd verifier/

	$(shell ( cd verifier/; \

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

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

		  echo '#ifdef FILL_ARRAY'; \

		  echo '#ifdef FILL_ARRAY'; \

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

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