mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 21:15:45 +00:00
scripts: Stop using "--no-default-features" for cargo build
Now feature "mshv" can be built together with "kvm". There is no need to use "--no-default-features" any more. Fixes: #5647 Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
parent
3bb26093eb
commit
219716c3f1
@ -15,7 +15,7 @@ process_common_args "$@"
|
|||||||
test_features=""
|
test_features=""
|
||||||
|
|
||||||
if [ "$hypervisor" = "mshv" ] ; then
|
if [ "$hypervisor" = "mshv" ] ; then
|
||||||
test_features="--no-default-features --features mshv"
|
test_features="--features mshv"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
|
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/"
|
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
||||||
fi
|
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
|
# Test ovs-dpdk relies on hugepages
|
||||||
HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
|
HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
|
||||||
|
@ -15,7 +15,7 @@ process_common_args "$@"
|
|||||||
test_features=""
|
test_features=""
|
||||||
|
|
||||||
if [ "$hypervisor" = "mshv" ] ; then
|
if [ "$hypervisor" = "mshv" ] ; then
|
||||||
test_features="--no-default-features --features mshv"
|
test_features="--features mshv"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
|
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/"
|
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
||||||
fi
|
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
|
export RUST_BACKTRACE=1
|
||||||
time cargo test $test_features "rate_limiter::$test_filter" -- --test-threads=1 ${test_binary_args[*]}
|
time cargo test $test_features "rate_limiter::$test_filter" -- --test-threads=1 ${test_binary_args[*]}
|
||||||
|
@ -46,7 +46,7 @@ if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
|
|||||||
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
||||||
fi
|
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
|
export RUST_BACKTRACE=1
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ TARGET_CC="musl-gcc"
|
|||||||
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
||||||
fi
|
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.
|
# We always copy a fresh version of our binary for our L2 guest.
|
||||||
cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR
|
cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR
|
||||||
|
@ -9,7 +9,7 @@ process_common_args "$@"
|
|||||||
test_features=""
|
test_features=""
|
||||||
|
|
||||||
if [ "$hypervisor" = "mshv" ] ; then
|
if [ "$hypervisor" = "mshv" ] ; then
|
||||||
test_features="--no-default-features --features mshv"
|
test_features="--features mshv"
|
||||||
fi
|
fi
|
||||||
WIN_IMAGE_FILE="/root/workloads/windows-server-2022-amd64-2.raw"
|
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 create windows-snapshot-base --table "0 $img_blk_size snapshot-origin /dev/mapper/windows-base"
|
||||||
dmsetup mknodes
|
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
|
export RUST_BACKTRACE=1
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ process_common_args "$@"
|
|||||||
test_features=""
|
test_features=""
|
||||||
|
|
||||||
if [ "$hypervisor" = "mshv" ] ; then
|
if [ "$hypervisor" = "mshv" ] ; then
|
||||||
test_features="--no-default-features --features mshv"
|
test_features="--features mshv"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
|
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}"
|
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.
|
# We always copy a fresh version of our binary for our L2 guest.
|
||||||
cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR
|
cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR
|
||||||
@ -202,7 +202,7 @@ fi
|
|||||||
|
|
||||||
# Run tests on dbus_api
|
# Run tests on dbus_api
|
||||||
if [ $RES -eq 0 ]; then
|
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
|
export RUST_BACKTRACE=1
|
||||||
# integration tests now do not reply on build feature "dbus_api"
|
# integration tests now do not reply on build feature "dbus_api"
|
||||||
time cargo test $test_features "dbus_api::$test_filter" -- ${test_binary_args[*]}
|
time cargo test $test_features "dbus_api::$test_filter" -- ${test_binary_args[*]}
|
||||||
|
@ -92,7 +92,7 @@ if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then
|
|||||||
CFLAGS="-I /usr/include/${TEST_ARCH}-linux-musl/ -idirafter /usr/include/"
|
CFLAGS="-I /usr/include/${TEST_ARCH}-linux-musl/ -idirafter /usr/include/"
|
||||||
fi
|
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
|
# setup hugepages
|
||||||
HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
|
HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
|
||||||
|
@ -9,7 +9,6 @@ BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
|
|||||||
cargo_args=("")
|
cargo_args=("")
|
||||||
|
|
||||||
if [[ $hypervisor = "mshv" ]]; then
|
if [[ $hypervisor = "mshv" ]]; then
|
||||||
cargo_args+=("--no-default-features")
|
|
||||||
cargo_args+=("--features $hypervisor")
|
cargo_args+=("--features $hypervisor")
|
||||||
elif [[ $(uname -m) = "x86_64" ]]; then
|
elif [[ $(uname -m) = "x86_64" ]]; then
|
||||||
cargo_args+=("--features tdx")
|
cargo_args+=("--features tdx")
|
||||||
|
Loading…
Reference in New Issue
Block a user