diff --git a/admin/coverage b/admin/coverage index c4c0d852..18d63756 100755 --- a/admin/coverage +++ b/admin/coverage @@ -7,4 +7,9 @@ cargo llvm-cov clean --workspace cargo build --locked --all-targets --all-features cargo test --locked --all-features + +## bogo +cargo test --locked --all-features run_bogo_tests_ring -- --ignored +cargo test --locked --all-features run_bogo_tests_aws_lc_rs -- --ignored + cargo llvm-cov report "$@" diff --git a/bogo/runme b/bogo/runme index a3b105f5..8ac3155e 100755 --- a/bogo/runme +++ b/bogo/runme @@ -7,10 +7,10 @@ set -xe case ${BOGO_SHIM_PROVIDER:-ring} in ring) - cargo build --example bogo_shim + cargo build -p rustls --example bogo_shim ;; aws-lc-rs) - cargo build --example bogo_shim --no-default-features --features aws_lc_rs,tls12,logging + cargo build -p rustls --example bogo_shim --no-default-features --features aws_lc_rs,tls12,logging ;; existing) ;; diff --git a/rustls/tests/bogo.rs b/rustls/tests/bogo.rs index 258d1be0..66be49db 100644 --- a/rustls/tests/bogo.rs +++ b/rustls/tests/bogo.rs @@ -3,16 +3,33 @@ // and run. #[test] -#[cfg(coverage)] -fn run_bogo_tests() { +#[ignore] +fn run_bogo_tests_ring() { use std::process::Command; let rc = Command::new("./runme") .current_dir("../bogo") + .env("BOGO_SHIM_PROVIDER", "ring") .spawn() .expect("cannot run bogo/runme") .wait() .expect("cannot wait for bogo"); - assert!(rc.success(), "bogo exited non-zero"); + assert!(rc.success(), "bogo (ring) exited non-zero"); +} + +#[test] +#[ignore] +fn run_bogo_tests_aws_lc_rs() { + use std::process::Command; + + let rc = Command::new("./runme") + .current_dir("../bogo") + .env("BOGO_SHIM_PROVIDER", "aws-lc-rs") + .spawn() + .expect("cannot run bogo/runme") + .wait() + .expect("cannot wait for bogo"); + + assert!(rc.success(), "bogo (aws-lc-rs) exited non-zero"); }