Skip to content

Commit

Permalink
Include ~all crates in default members
Browse files Browse the repository at this point in the history
Several tests were not running due to being omitted from this list.
  • Loading branch information
tamird committed Jul 14, 2023
1 parent 5407d4a commit 6d06e2b
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[alias]
xtask = "run --package xtask --"
build-bpfel = "build -Zbuild-std=core --target=bpfel-unknown-none"
build-bpfeb = "build -Zbuild-std=core --target=bpfeb-unknown-none"

[target.armv7-unknown-linux-gnueabi]
linker = "arm-linux-gnueabi-gcc"
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/build-aya-bpf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
- aarch64
- arm
- riscv64
target:
- bpfel-unknown-none
- bpfeb-unknown-none
runs-on: ubuntu-20.04

steps:
Expand All @@ -38,11 +41,12 @@ jobs:
- name: Prereqs
run: cargo install bpf-linker

- uses: taiki-e/install-action@cargo-hack
- name: Build
env:
CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.arch }}
run: |
cargo build-bpfel -p aya-bpf --verbose
cargo build-bpfeb -p aya-bpf --verbose
cargo build-bpfel -p aya-log-ebpf --verbose
cargo build-bpfeb -p aya-log-ebpf --verbose
cargo hack build --package aya-bpf --package aya-log-ebpf \
--feature-powerset \
--target ${{ matrix.target }} \
-Z build-std=core
17 changes: 14 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[workspace]
members = [
"aya",
"aya-obj",
"aya-tool",
"aya-log",
"aya-log-common",
"aya-log-parser",
"aya-obj",
"aya-tool",
"test/integration-test",
"xtask",

Expand All @@ -19,15 +19,26 @@ members = [
"bpf/aya-log-ebpf",
"test/integration-ebpf",
]

resolver = "2"

default-members = [
"aya",
"aya-bpf-macros",
"aya-log",
"aya-log-common",
"aya-log-parser",
"aya-obj",
"aya-tool",
"aya-log",
# test/integration-test is omitted; it must be built with xtask.
"xtask",

"aya-bpf-macros",
"aya-log-ebpf-macros",

# ebpf crates are omitted; they must be built with:
# --target bpfe{b,l}-unknown-none
# CARGO_CFG_BPF_TARGET_ARCH={x86_64,aarch64,arm,riscv64}
]

[profile.dev]
Expand Down
4 changes: 2 additions & 2 deletions aya-log-common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ mod test {
#[test]
fn log_value_length_sufficient() {
assert!(
LOG_BUF_CAPACITY >= LogValueLength::MAX.into(),
"{} < {}",
LOG_BUF_CAPACITY <= LogValueLength::MAX.into(),
"{} > {}",
LOG_BUF_CAPACITY,
LogValueLength::MAX
);
Expand Down
3 changes: 1 addition & 2 deletions aya-log-parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ mod test {
Fragment::Parameter(Parameter {
hint: DisplayHint::Ip
}),
Fragment::Literal(" lmao ".into()),
Fragment::Literal(" {{}} {{something}}".into()),
Fragment::Literal(" lmao {} {something}".into()),
])
);
assert!(parse("foo {:}").is_err());
Expand Down
9 changes: 7 additions & 2 deletions bpf/aya-bpf/src/programs/sk_buff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,13 @@ impl SkBuffContext {
/// # Examples
///
/// ```no_run
/// mod bindings;
/// use bindings::{ethhdr, iphdr, udphdr};
/// use aya_bpf::programs::SkBuffContext;
/// # #[allow(non_camel_case_types)]
/// # struct ethhdr {};
/// # #[allow(non_camel_case_types)]
/// # struct iphdr {};
/// # #[allow(non_camel_case_types)]
/// # struct udphdr {};
///
/// const ETH_HLEN: usize = core::mem::size_of::<ethhdr>();
/// const IP_HLEN: usize = core::mem::size_of::<iphdr>();
Expand Down
9 changes: 7 additions & 2 deletions bpf/aya-bpf/src/programs/tc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,13 @@ impl TcContext {
/// # Examples
///
/// ```no_run
/// mod bindings;
/// use bindings::{ethhdr, iphdr, udphdr};
/// use aya_bpf::programs::TcContext;
/// # #[allow(non_camel_case_types)]
/// # struct ethhdr {};
/// # #[allow(non_camel_case_types)]
/// # struct iphdr {};
/// # #[allow(non_camel_case_types)]
/// # struct udphdr {};
///
/// const ETH_HLEN: usize = core::mem::size_of::<ethhdr>();
/// const IP_HLEN: usize = core::mem::size_of::<iphdr>();
Expand Down

0 comments on commit 6d06e2b

Please sign in to comment.