scripts: Use hypervisor variable instead of kvm

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam 2021-01-11 16:09:44 -08:00 committed by Rob Bradford
parent 9cdcbb5121
commit c4fb0f36bd
3 changed files with 8 additions and 7 deletions

View File

@ -254,7 +254,7 @@ cmd_build() {
[ $build = "release" ] && cargo_args+=("--release")
cargo_args+=(--target "$target")
[ $(uname -m) = "aarch64" ] && cargo_args+=("--no-default-features")
[ $(uname -m) = "aarch64" ] && cargo_args+=(--features "kvm")
[ $(uname -m) = "aarch64" ] && cargo_args+=(--features $hypervisor)
rustflags=""
if [ $(uname -m) = "aarch64" ] && [ $libc = "musl" ] ; then

View File

@ -18,9 +18,9 @@ time cargo rustc --bin cloud-hypervisor -- -D warnings
time cargo rustc -p vhost_user_net --bin vhost_user_net -- -D warnings
time cargo test
time cargo audit
time cargo clippy --all-targets --no-default-features --features "acpi,kvm" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "acpi,kvm" -- -D warnings
time cargo clippy --all-targets --no-default-features --features "kvm" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "kvm" -- -D warnings
time cargo clippy --all-targets --no-default-features --features "acpi,$hypervisor" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "acpi,$hypervisor" -- -D warnings
time cargo clippy --all-targets --no-default-features --features "$hypervisor" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "$hypervisor" -- -D warnings
time cargo fmt -- --check
time cargo build --all --release

View File

@ -179,8 +179,9 @@ update_workloads() {
}
process_common_args "$@"
features_build="--no-default-features --features kvm "
features_test="--no-default-features --features integration_tests,kvm"
features_build="--no-default-features --features $hypervisor "
features_test="--no-default-features --features integration_tests,$hypervisor"
# lock the workloads folder to avoid parallel updating by different containers
(