selftests/bpf: bring back c++ include/link test
Subsystems (6)
PATCH v2 1/1 selftests/bpf: bring back c++ include/link test
Commit 5c26f9a78358 ("libbpf: Don't use cxx to test_libpf target") converted existing c++ test to c. We still want to include and link against libbpf from c++ code, so reinstate this test back, this time in a form of a selftest with a clear comment about its purpose.
v2:
* -lelf -> $(LDLIBS) (Andrii Nakryiko)
---
tools/lib/bpf/.gitignore | 1 -
tools/lib/bpf/Makefile | 5 +----
tools/testing/selftests/bpf/.gitignore | 1 +
tools/testing/selftests/bpf/Makefile | 6 +++++-
.../test_libbpf.c => testing/selftests/bpf/test_cpp.cpp} | 0
5 files changed, 7 insertions(+), 6 deletions(-)
rename tools/{lib/bpf/test_libbpf.c => testing/selftests/bpf/test_cpp.cpp} (100%)tools/lib/bpf/.gitignore +0 -1
@@ -1,7 +1,6 @@ libbpf_version.h libbpf.pc FEATURE-DUMP.libbpf -test_libbpf libbpf.so.* TAGS tags
tools/lib/bpf/Makefile +1 -4
@@ -152,7 +152,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) -CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) $(OUTPUT)test_libbpf +CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) all: fixdep $(Q)$(MAKE) all_cmd
@@ -196,9 +196,6 @@ $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN_SHARED) $(OUTPUT)libbpf.a: $(BPF_IN_STATIC) $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ -$(OUTPUT)test_libbpf: test_libbpf.c $(OUTPUT)libbpf.a - $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $^ -lelf -o $@ - $(OUTPUT)libbpf.pc: $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \ -e "s|@LIBDIR@|$(libdir_SQ)|" \
tools/testing/selftests/bpf/.gitignore +1 -0
@@ -37,5 +37,6 @@ libbpf.so.* test_hashmap test_btf_dump xdping +test_cpp /no_alu32 /bpf_gcc
tools/testing/selftests/bpf/Makefile +5 -1
@@ -71,7 +71,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ # Compile but not part of 'make run_tests' TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ - test_lirc_mode2_user xdping + test_lirc_mode2_user xdping test_cpp TEST_CUSTOM_PROGS = urandom_read
@@ -317,6 +317,10 @@ verifier/tests.h: verifier/*.c $(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT) $(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@ +# Make sure we are able to include and link libbpf against c++. +$(OUTPUT)/test_cpp: test_cpp.cpp $(BPFOBJ) + $(CXX) $(CFLAGS) $^ $(LDLIBS) -o $@ + EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) \ prog_tests/tests.h map_tests/tests.h verifier/tests.h \ feature $(OUTPUT)/*.o $(OUTPUT)/no_alu32 $(OUTPUT)/bpf_gcc
tools/testing/selftests/bpf/test_cpp.cpp renamed from tools/lib/bpf/test_libbpf.c +0 -0
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Quoted 7 lines · Stanislav Fomichev
Commit
5c26f9a78358("libbpf: Don't use cxx totest_libpftarget") converted existing c++ test to c. We still want to include and link against libbpf from c++ code, so reinstate this test back, this time in a form of a selftest with a clear comment about its purpose.
Quoted 6 lines
v2:
* -lelf -> $(LDLIBS) (Andrii Nakryiko)Fixes 5c26f9a78358 ("libbpf: Don't use cxx to test_libpf target")Signed-off-by Stanislav Fomichev <[email protected]>---
LGTM.
Quoted 8 lines
tools/lib/bpf/.gitignore | 1 -
tools/lib/bpf/Makefile | 5 +----
tools/testing/selftests/bpf/.gitignore | 1 +
tools/testing/selftests/bpf/Makefile | 6 +++++-
.../test_libbpf.c => testing/selftests/bpf/test_cpp.cpp} | 0
5 files changed, 7 insertions(+), 6 deletions(-)
rename tools/{lib/bpf/test_libbpf.c => testing/selftests/bpf/test_cpp.cpp} (100%)[...]
Alexei Starovoitov
AppliedQuoted 7 lines · Stanislav Fomichev
Commit
5c26f9a78358("libbpf: Don't use cxx totest_libpftarget") converted existing c++ test to c. We still want to include and link against libbpf from c++ code, so reinstate this test back, this time in a form of a selftest with a clear comment about its purpose.
Quoted 5 lines
v2:
* -lelf -> $(LDLIBS) (Andrii Nakryiko)Fixes 5c26f9a78358 ("libbpf: Don't use cxx to test_libpf target")Signed-off-by Stanislav Fomichev <[email protected]>
Applied. Thanks