External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 11:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Remove all references to 'mmio' feature

Browse Source 
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-10-15 14:20:29 +02:00 committed by Rob Bradford
parent 74c08e5669
commit f73a345107
6 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/dev_cli.sh
View File

@ -210,7 +210,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 "mmio,kvm")
[ $(uname -m) = "aarch64" ] && cargo_args+=(--features "kvm")
rustflags=""
if [ $(uname -m) = "aarch64" ] && [ $libc = "musl" ] ; then

10
scripts/run_cargo_tests.sh
View File

@ -15,11 +15,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 "pci,acpi,kvm" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "pci,acpi,kvm" -- -D warnings
time cargo clippy --all-targets --no-default-features --features "pci,kvm" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "pci,kvm" -- -D warnings
time cargo clippy --all-targets --no-default-features --features "mmio,kvm" -- -D warnings
time cargo rustc --bin cloud-hypervisor --no-default-features --features "mmio,kvm" -- -D warnings
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 fmt -- --check
time cargo build --all --release

16
scripts/run_integration_tests_aarch64.sh
View File

@ -185,7 +185,7 @@ TARGET_CC="musl-gcc"
CFLAGS="-I /usr/include/aarch64-linux-musl/ -idirafter /usr/include/"
fi
cargo build --all --release --no-default-features --features pci,kvm --target $BUILD_TARGET
cargo build --all --release --no-default-features --features kvm --target $BUILD_TARGET
strip target/$BUILD_TARGET/release/cloud-hypervisor
strip target/$BUILD_TARGET/release/vhost_user_net
strip target/$BUILD_TARGET/release/ch-remote
@ -197,21 +197,9 @@ sudo bash -c "echo 10 > /sys/kernel/mm/ksm/sleep_millisecs"
sudo bash -c "echo 1 > /sys/kernel/mm/ksm/run"
export RUST_BACKTRACE=1
time cargo test --no-default-features --features "integration_tests,pci,kvm" "tests::parallel::$@" -- --skip test_snapshot_restore
time cargo test --no-default-features --features "integration_tests,kvm" "tests::parallel::$@" -- --skip test_snapshot_restore
RES=$?
if [ $RES -eq 0 ]; then
# virtio-mmio based testing
cargo build --release --target $BUILD_TARGET --no-default-features --features "mmio,kvm"
strip target/$BUILD_TARGET/release/cloud-hypervisor
strip target/$BUILD_TARGET/release/vhost_user_net
strip target/$BUILD_TARGET/release/ch-remote
export RUST_BACKTRACE=1
time cargo test --no-default-features --features "integration_tests,mmio,kvm" "tests::parallel::$@"
RES=$?
fi
# Tear vhost_user_net test network down
sudo ip link del vunet-tap0
sudo ip link del vunet-tap1

9
scripts/run_integration_tests_sgx.sh
View File

@ -19,13 +19,4 @@ export RUST_BACKTRACE=1
time cargo test --features "integration_tests" "tests::sgx::$@"
RES=$?
if [ $RES -eq 0 ]; then
# virtio-mmio based testing
cargo build --all --release --target $BUILD_TARGET --no-default-features --features "mmio,kvm"
strip target/$BUILD_TARGET/release/cloud-hypervisor
time cargo test --features "integration_tests,mmio" "tests::sgx::$@"
RES=$?
fi
exit $RES

20
scripts/run_integration_tests_x86_64.sh
View File

@ -232,26 +232,6 @@ if [ $RES -eq 0 ]; then
RES=$?
fi
if [ $RES -eq 0 ]; then
# virtio-mmio based testing
cargo build --all --release --target $BUILD_TARGET --no-default-features --features "mmio,kvm"
strip target/$BUILD_TARGET/release/cloud-hypervisor
strip target/$BUILD_TARGET/release/vhost_user_net
strip target/$BUILD_TARGET/release/ch-remote
export RUST_BACKTRACE=1
time cargo test --features "integration_tests,mmio" "tests::parallel::$@"
RES=$?
# Run some tests in sequence since the result could be affected by other tests
# running in parallel.
if [ $RES -eq 0 ]; then
export RUST_BACKTRACE=1
time cargo test --features "integration_tests,mmio" "tests::sequential::$@" -- --test-threads=1
RES=$?
fi
fi
# Tear VFIO test network down
sudo ip link del vfio-br0
sudo ip link del vfio-tap0

2
scripts/run_unit_tests.sh
View File

@ -5,7 +5,7 @@ source $HOME/.cargo/env
BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
cargo_args=("$@")
[ $(uname -m) = "aarch64" ] && cargo_args+=("--no-default-features")
[ $(uname -m) = "aarch64" ] && cargo_args+=("--features mmio,kvm")
[ $(uname -m) = "aarch64" ] && cargo_args+=("--features kvm")
export RUST_BACKTRACE=1
cargo test --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1;