From 45fa8be97a6c7d4a555f0806f57b19039ffc1bd5 Mon Sep 17 00:00:00 2001 From: Smit Gardhariya Date: Wed, 28 Sep 2022 11:41:01 +0530 Subject: [PATCH] scripts: Remove common feature flag for mshv tests Commit b2d1dd65f39 ("build: Remove "fwdebug" and "common" feature flags") removed support for common features flag. But some of the scripts are still using that parameter specifically test related to mshv hypervisor. Thus fix those scripts by removing common feature flag. Signed-off-by: Smit Gardhariya --- scripts/run_integration_tests_live_migration.sh | 2 +- scripts/run_integration_tests_rate_limiter.sh | 2 +- scripts/run_integration_tests_windows_x86_64.sh | 2 +- scripts/run_integration_tests_x86_64.sh | 2 +- scripts/run_metrics.sh | 2 +- scripts/run_unit_tests.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/run_integration_tests_live_migration.sh b/scripts/run_integration_tests_live_migration.sh index c16ed64fa..29f2b9385 100755 --- a/scripts/run_integration_tests_live_migration.sh +++ b/scripts/run_integration_tests_live_migration.sh @@ -15,7 +15,7 @@ process_common_args "$@" features="" if [ "$hypervisor" = "mshv" ] ; then - features="--no-default-features --features mshv,common" + features="--no-default-features --features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR diff --git a/scripts/run_integration_tests_rate_limiter.sh b/scripts/run_integration_tests_rate_limiter.sh index cd0236722..62df36817 100755 --- a/scripts/run_integration_tests_rate_limiter.sh +++ b/scripts/run_integration_tests_rate_limiter.sh @@ -15,7 +15,7 @@ process_common_args "$@" features="" if [ "$hypervisor" = "mshv" ] ; then - features="--no-default-features --features mshv,common" + features="--no-default-features --features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR diff --git a/scripts/run_integration_tests_windows_x86_64.sh b/scripts/run_integration_tests_windows_x86_64.sh index 9e07bb239..fe226bcd7 100755 --- a/scripts/run_integration_tests_windows_x86_64.sh +++ b/scripts/run_integration_tests_windows_x86_64.sh @@ -9,7 +9,7 @@ process_common_args "$@" features="" if [ "$hypervisor" = "mshv" ] ; then - features="--no-default-features --features mshv,common" + features="--no-default-features --features mshv" fi WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw" diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 5ad8b9106..a9ba7a180 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -15,7 +15,7 @@ process_common_args "$@" features="" if [ "$hypervisor" = "mshv" ] ; then - features="--no-default-features --features mshv,common" + features="--no-default-features --features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR diff --git a/scripts/run_metrics.sh b/scripts/run_metrics.sh index 7ca195c92..15212703a 100755 --- a/scripts/run_metrics.sh +++ b/scripts/run_metrics.sh @@ -32,7 +32,7 @@ process_common_args "$@" features="" if [ "$hypervisor" = "mshv" ]; then - features="--no-default-features --features mshv,common" + features="--no-default-features --features mshv" fi cp scripts/sha1sums-${TEST_ARCH} $WORKLOADS_DIR diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh index 0023e325f..5ad9206e7 100755 --- a/scripts/run_unit_tests.sh +++ b/scripts/run_unit_tests.sh @@ -10,7 +10,7 @@ cargo_args=("") if [[ $hypervisor = "mshv" ]]; then cargo_args+=("--no-default-features") - cargo_args+=("--features common,$hypervisor") + cargo_args+=("--features $hypervisor") elif [[ $(uname -m) = "x86_64" ]]; then cargo_args+=("--features tdx") fi