diff --git a/scripts/run_integration_tests_live_migration.sh b/scripts/run_integration_tests_live_migration.sh index fd41250ba..e8126a541 100755 --- a/scripts/run_integration_tests_live_migration.sh +++ b/scripts/run_integration_tests_live_migration.sh @@ -15,7 +15,7 @@ process_common_args "$@" test_features="" if [ "$hypervisor" = "mshv" ] ; then - test_features="--no-default-features --features mshv" + test_features="--features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR @@ -68,7 +68,7 @@ if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/" fi -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET # Test ovs-dpdk relies on hugepages HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'` diff --git a/scripts/run_integration_tests_rate_limiter.sh b/scripts/run_integration_tests_rate_limiter.sh index d4fbe2ff8..c502d32ac 100755 --- a/scripts/run_integration_tests_rate_limiter.sh +++ b/scripts/run_integration_tests_rate_limiter.sh @@ -15,7 +15,7 @@ process_common_args "$@" test_features="" if [ "$hypervisor" = "mshv" ] ; then - test_features="--no-default-features --features mshv" + test_features="--features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR @@ -55,7 +55,7 @@ if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/" fi -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET export RUST_BACKTRACE=1 time cargo test $test_features "rate_limiter::$test_filter" -- --test-threads=1 ${test_binary_args[*]} diff --git a/scripts/run_integration_tests_sgx.sh b/scripts/run_integration_tests_sgx.sh index 3f98b6a1b..c8e9ec62b 100755 --- a/scripts/run_integration_tests_sgx.sh +++ b/scripts/run_integration_tests_sgx.sh @@ -46,7 +46,7 @@ if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/" fi -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET export RUST_BACKTRACE=1 diff --git a/scripts/run_integration_tests_vfio.sh b/scripts/run_integration_tests_vfio.sh index 746949a9e..4d198af3f 100755 --- a/scripts/run_integration_tests_vfio.sh +++ b/scripts/run_integration_tests_vfio.sh @@ -76,7 +76,7 @@ TARGET_CC="musl-gcc" CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/" fi -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET # We always copy a fresh version of our binary for our L2 guest. cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR diff --git a/scripts/run_integration_tests_windows_x86_64.sh b/scripts/run_integration_tests_windows_x86_64.sh index 236ed9ffe..4afd5482f 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 "$@" test_features="" if [ "$hypervisor" = "mshv" ] ; then - test_features="--no-default-features --features mshv" + test_features="--features mshv" fi WIN_IMAGE_FILE="/root/workloads/windows-server-2022-amd64-2.raw" @@ -44,7 +44,7 @@ dmsetup mknodes dmsetup create windows-snapshot-base --table "0 $img_blk_size snapshot-origin /dev/mapper/windows-base" dmsetup mknodes -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET export RUST_BACKTRACE=1 diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 45c47c133..2a14615f0 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -15,7 +15,7 @@ process_common_args "$@" test_features="" if [ "$hypervisor" = "mshv" ] ; then - test_features="--no-default-features --features mshv" + test_features="--features mshv" fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR @@ -164,7 +164,7 @@ cp $VMLINUX_IMAGE $VFIO_DIR || exit 1 BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}" -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET # We always copy a fresh version of our binary for our L2 guest. cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR @@ -202,7 +202,7 @@ fi # Run tests on dbus_api if [ $RES -eq 0 ]; then - cargo build --no-default-features --features "kvm,mshv,dbus_api" --all --release --target $BUILD_TARGET + cargo build --features "mshv,dbus_api" --all --release --target $BUILD_TARGET export RUST_BACKTRACE=1 # integration tests now do not reply on build feature "dbus_api" time cargo test $test_features "dbus_api::$test_filter" -- ${test_binary_args[*]} diff --git a/scripts/run_metrics.sh b/scripts/run_metrics.sh index ea39c2b48..7c60bef1b 100755 --- a/scripts/run_metrics.sh +++ b/scripts/run_metrics.sh @@ -92,7 +92,7 @@ if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then CFLAGS="-I /usr/include/${TEST_ARCH}-linux-musl/ -idirafter /usr/include/" fi -cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET +cargo build --features mshv --all --release --target $BUILD_TARGET # setup hugepages HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'` diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh index 9b27add0e..b511bffd7 100755 --- a/scripts/run_unit_tests.sh +++ b/scripts/run_unit_tests.sh @@ -9,7 +9,6 @@ BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu} cargo_args=("") if [[ $hypervisor = "mshv" ]]; then - cargo_args+=("--no-default-features") cargo_args+=("--features $hypervisor") elif [[ $(uname -m) = "x86_64" ]]; then cargo_args+=("--features tdx")