From: Manu Bretelle <chantr4@gmail.com>
To: bpf@vger.kernel.org, quentin@isovalent.com, andrii@kernel.org,
daniel@iogearbox.net, ast@kernel.org, martin.lau@linux.dev,
song@kernel.org, john.fastabend@gmail.com, kpsingh@kernel.org,
sdf@google.com, haoluo@google.com, jolsa@kernel.org
Subject: [PATCH v1 bpf-next 9/9] bpftool: Add Makefile to facilitate bpftool_tests usage
Date: Thu, 16 Nov 2023 11:42:36 -0800 [thread overview]
Message-ID: <20231116194236.1345035-10-chantr4@gmail.com> (raw)
In-Reply-To: <20231116194236.1345035-1-chantr4@gmail.com>
Provide some Makefile targets to run the linter, build the tests, and
run them on the host or in a VM.
$ make vmtest
cargo test --no-run --offline
Finished test [unoptimized + debuginfo] target(s) in 0.05s
Executable unittests src/main.rs
(target/debug/deps/bpftool_tests-afa5a7eef3cdeafb)
vmtest -k /data/users/chantra/bpf-next/arch/x86/boot/bzImage
"RUST_TEST_THREADS=1 BPFTOOL_PATH=../tools/build/bpftool/bpftool cargo
test"
=> bzImage
===> Booting
===> Setting up VM
===> Running command
Finished test [unoptimized + debuginfo] target(s) in 2.05s
Running unittests src/main.rs
(target/debug/deps/bpftool_tests-afa5a7eef3cdeafb)
running 11 tests
test bpftool_tests::run_bpftool ... ok
test bpftool_tests::run_bpftool_map_dump_id ... ok
test bpftool_tests::run_bpftool_map_list ... ok
test bpftool_tests::run_bpftool_map_pids ... ok
test bpftool_tests::run_bpftool_prog_list ... ok
test bpftool_tests::run_bpftool_prog_pids ... ok
test bpftool_tests::run_bpftool_prog_show_id ... ok
test bpftool_tests::run_bpftool_struct_ops_can_unregister_id ... ok
test bpftool_tests::run_bpftool_struct_ops_can_unregister_name ... ok
test bpftool_tests::run_bpftool_struct_ops_dump_name ... ok
test bpftool_tests::run_bpftool_struct_ops_list ... ok
test result: ok. 11 passed; 0 failed; 0 ignored; 0 measured; 0 filtered
out; finished in 2.88s
Signed-off-by: Manu Bretelle <chantr4@gmail.com>
---
.../selftests/bpf/bpftool_tests/Makefile | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 tools/testing/selftests/bpf/bpftool_tests/Makefile
diff --git a/tools/testing/selftests/bpf/bpftool_tests/Makefile b/tools/testing/selftests/bpf/bpftool_tests/Makefile
new file mode 100644
index 000000000000..0b5633cda8b4
--- /dev/null
+++ b/tools/testing/selftests/bpf/bpftool_tests/Makefile
@@ -0,0 +1,22 @@
+BPFTOOL := ../tools/build/bpftool/bpftool
+
+lint:
+ cargo clippy --tests
+ cargo check --tests
+
+# Build the tests but do not run them.
+build-test:
+ cargo test --no-run --offline
+
+# Run the tests on the host using sudo
+test: build-test
+ RUST_TEST_THREADS=1 BPFTOOL_PATH=$(BPFTOOL) sudo -E $(shell which cargo) test --offline
+
+# Run the tests in a vm. Requires danobi/vmtest.
+vmtest: build-test
+ $(eval repo_root := $(shell git rev-parse --show-toplevel))
+ $(eval kernel_img := $(shell make -s -C $(repo_root) image_name))
+ vmtest -k $(repo_root)/$(kernel_img) "RUST_TEST_THREADS=1 BPFTOOL_PATH=$(BPFTOOL) cargo test"
+
+clean:
+ cargo clean
--
2.39.3
next prev parent reply other threads:[~2023-11-16 19:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 19:42 [PATCH v1 bpf-next 0/9] bpftool: Add end-to-end testing Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 1/9] bpftool: add testing skeleton Manu Bretelle
2023-11-21 1:37 ` Alexei Starovoitov
2023-11-21 16:26 ` Quentin Monnet
2023-11-21 16:42 ` Alexei Starovoitov
2023-11-21 19:50 ` Andrii Nakryiko
2023-11-27 17:07 ` Quentin Monnet
2023-11-27 18:39 ` Andrii Nakryiko
2023-12-15 6:26 ` Manu Bretelle
2023-11-27 17:07 ` Quentin Monnet
2023-12-15 6:37 ` Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 2/9] bpftool: add libbpf-rs dependency and minimal bpf program Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 3/9] bpftool: open and load bpf object Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 4/9] bpftool: Add test to verify that pids are associated to maps Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 5/9] bpftool: add test for bpftool prog Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 6/9] bpftool: test that we can dump and read the content of a map Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 7/9] bpftool: Add struct_ops tests Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 8/9] bpftool: Add bpftool_tests README.md Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` Manu Bretelle [this message]
2023-11-21 16:26 ` [PATCH v1 bpf-next 9/9] bpftool: Add Makefile to facilitate bpftool_tests usage Quentin Monnet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231116194236.1345035-10-chantr4@gmail.com \
--to=chantr4@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox