kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Fix feature build for aarch64 and mshv builds

Browse Source 
These were erroneously skipping features for the unit tests and the
"build" target for dev_cli.sh

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2022-03-28 12:09:02 +01:00
committed by Bo Chen
parent 6eb47bdb03
commit fa7487629f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/dev_cli.sh
-2
View File
@@ -270,8 +270,6 @@ cmd_build() {
cargo_args=("$@") cargo_args=("$@")
[ $build = "release" ] && cargo_args+=("--release") [ $build = "release" ] && cargo_args+=("--release")
cargo_args+=(--target "$target") cargo_args+=(--target "$target")
[ "$(uname -m)" = "aarch64" ] && cargo_args+=("--no-default-features")
[ "$(uname -m)" = "aarch64" ] && cargo_args+=(--features "$hypervisor")
rustflags="" rustflags=""
target_cc="" target_cc=""
scripts/run_unit_tests.sh
+4 -4
View File
@@ -1,16 +1,16 @@
#!/bin/bash #!/bin/bash
source $HOME/.cargo/env source $HOME/.cargo/env
source $(dirname "$0")/test-util.sh source $(dirname "$0")/test-util.sh
process_common_args "$@" process_common_args "$@"
BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu} BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
cargo_args=("") cargo_args=("")
if [[ $(uname -m) = "aarch64" || $hypervisor = "mshv" ]]; then if [[ $hypervisor = "mshv" ]]; then
cargo_args+=("--no-default-features") cargo_args+=("--no-default-features")
cargo_args+=("--features $hypervisor") cargo_args+=("--features common,$hypervisor")
fi fi
if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
@@ -19,4 +19,4 @@ if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
fi fi
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1; cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1