From 34ffde48ee8488038498c3b621dfd40aa3095968 Mon Sep 17 00:00:00 2001 From: lyuts Date: Sun, 19 Nov 2023 17:48:45 -0800 Subject: [PATCH 1/3] tests: update instructions on setting up and running tests - Update the list of required packages. - Update the command for executing tests in a VM. --- test/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/README.md b/test/README.md index 5a0db31b..fa3eebca 100644 --- a/test/README.md +++ b/test/README.md @@ -10,6 +10,8 @@ You'll need: 1. `rustup toolchain install nightly` 1. `rustup target add {aarch64,x86_64}-unknown-linux-musl` 1. `cargo install bpf-linker` +1. `libelf-dev` (`libelf-devel` on rpm-based distros) +1. `llvm` (for `llvm-objcopy`) 1. (virtualized only) `qemu` ## Usage @@ -25,7 +27,7 @@ cargo xtask integration-test local ### Virtualized ```bash -cargo xtask integration-test vm +cargo xtask integration-test vm ``` ### Writing an integration test From bb5023cea54e4c0018321ea37725724580c46331 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:56:31 +0000 Subject: [PATCH 2/3] build(deps): bump DavidAnson/markdownlint-cli2-action from 9 to 13 Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 9 to 13. - [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases) - [Commits](https://github.com/davidanson/markdownlint-cli2-action/compare/v9...v13) --- updated-dependencies: - dependency-name: DavidAnson/markdownlint-cli2-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b55e57bc..abd1d444 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: run: git ls-files -- '*.c' '*.h' | xargs clang-format --dry-run --Werror - name: Check Markdown - uses: DavidAnson/markdownlint-cli2-action@v9 + uses: DavidAnson/markdownlint-cli2-action@v13 - name: Check TOML formatting run: taplo fmt --check From c89c95bc0bc220e3aee423a63628ace3e1538f43 Mon Sep 17 00:00:00 2001 From: arctic-alpaca <67190338+arctic-alpaca@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:09:43 +0100 Subject: [PATCH 3/3] tests: change AF_XDP test `PacketMap` repr to `C` --- test/integration-test/src/tests/xdp.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration-test/src/tests/xdp.rs b/test/integration-test/src/tests/xdp.rs index 784ffe75..bd694287 100644 --- a/test/integration-test/src/tests/xdp.rs +++ b/test/integration-test/src/tests/xdp.rs @@ -28,7 +28,7 @@ fn af_xdp() { // So this needs to be page aligned. Pages are 4k on all mainstream architectures except for // Apple Silicon which uses 16k pages. So let's align on that for tests to run natively there. - #[repr(align(16384))] + #[repr(C, align(16384))] struct PacketMap(MaybeUninit<[u8; 4096]>); // Safety: don't access alloc down the line.