From c4fb0f36bdbcf596fb789ad7aa4f684517e5e39d Mon Sep 17 00:00:00 2001 From: Muminul Islam Date: Mon, 11 Jan 2021 16:09:44 -0800 Subject: [PATCH] scripts: Use hypervisor variable instead of kvm Signed-off-by: Muminul Islam --- scripts/dev_cli.sh | 2 +- scripts/run_cargo_tests.sh | 8 ++++---- scripts/run_integration_tests_aarch64.sh | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index 4cd37be7b..fd26c6acd 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -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 diff --git a/scripts/run_cargo_tests.sh b/scripts/run_cargo_tests.sh index 96dba25a3..b088002bf 100755 --- a/scripts/run_cargo_tests.sh +++ b/scripts/run_cargo_tests.sh @@ -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 diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 2b535a768..ec4766c10 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -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 (