Defeature bpf_loader; bpf_{c,rust} features now confined to programs/bpf

This commit is contained in:
Michael Vines
2019-03-04 10:08:21 -08:00
committed by Grimes
parent d0be16b49a
commit 03d6c9a552
7 changed files with 37 additions and 56 deletions

View File

@ -42,12 +42,12 @@ BENCH_ARTIFACT=current_bench_results.log
_ cargo +nightly bench ${V:+--verbose} \
-- -Z unstable-options --format=json | tee "$BENCH_FILE"
# Run bpf_loader bench with bpf_c feature enabled
echo --- program/bpf_loader bench --features=bpf_c
# Run bpf benches
echo --- program/bpf
(
set -x
cd programs/bpf_loader
cargo +nightly bench ${V:+--verbose} --features="bpf_c" \
cd programs/bpf
cargo +nightly bench ${V:+--verbose} --features=bpf_c \
-- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE"
)

View File

@ -44,21 +44,12 @@ test-stable-perf)
exit 0
}
# Run program package with these features
PROGRAM_FEATURES=bpf_c,bpf_rust
# Run all BPF C tests
# BPF program tests
_ make -C programs/bpf/c tests
_ programs/bpf/rust/noop/build.sh # Must be built out of band
_ cargo test --manifest-path programs/bpf/Cargo.toml --no-default-features --features=bpf_c,bpf_rust
# Must be built out of band
_ pushd programs/bpf/rust/noop
./build.sh
popd
_ cargo test --manifest-path programs/bpf/Cargo.toml --no-default-features --features="$PROGRAM_FEATURES"
_ cargo test --manifest-path programs/bpf_loader/Cargo.toml --no-default-features --features="$PROGRAM_FEATURES"
# Run root package tests witht these features
# Run root package tests with these features
ROOT_FEATURES=erasure,chacha
if [[ $(uname) = Darwin ]]; then
./build-perf-libs.sh