External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-02 01:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Run vhost-user-net tests for mmio transport

Browse Source 
No reason to skip vhost-user-net integration tests for the mmio
transport build.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-03-23 16:22:48 +01:00 committed by Rob Bradford
parent 68293fc0e8
commit c95851f48f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/run_integration_tests.sh
View File

@ -216,6 +216,10 @@ if [ $RES -eq 0 ]; then
cargo build --release --no-default-features --features "mmio" cargo build --release --no-default-features --features "mmio"
sudo setcap cap_net_admin+ep target/release/cloud-hypervisor sudo setcap cap_net_admin+ep target/release/cloud-hypervisor
# Ensure test binary has the same caps as the cloud-hypervisor one
time cargo test --no-run --features "integration_tests,mmio" -- --nocapture || exit 1
ls target/debug/deps/cloud_hypervisor-* | xargs -n 1 sudo setcap cap_net_admin+ep
newgrp kvm << EOF newgrp kvm << EOF
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
time cargo test --features "integration_tests,mmio" "$@" -- --nocapture time cargo test --features "integration_tests,mmio" "$@" -- --nocapture

12
tests/integration.rs
View File

@ -1294,6 +1294,8 @@ mod tests {
// Since virtio-net has 2 queue pairs, its vectors is as follows: // Since virtio-net has 2 queue pairs, its vectors is as follows:
// 1 virtio-net with 5 vectors: config, Rx (2), Tx (2) // 1 virtio-net with 5 vectors: config, Rx (2), Tx (2)
// Based on the above, the total vectors should 14. // Based on the above, the total vectors should 14.
// This is a PCI only feature.
#[cfg(not(feature = "mmio"))]
aver_eq!( aver_eq!(
tb, tb,
guest guest
@ -1318,12 +1320,12 @@ mod tests {
}); });
} }
#[cfg_attr(not(feature = "mmio"), test)] #[test]
fn test_vhost_user_net_default() { fn test_vhost_user_net_default() {
test_vhost_user_net(None, 2, Some(&prepare_vhost_user_net_daemon), false) test_vhost_user_net(None, 2, Some(&prepare_vhost_user_net_daemon), false)
} }
#[cfg_attr(not(feature = "mmio"), test)] #[test]
fn test_vhost_user_net_tap() { fn test_vhost_user_net_tap() {
test_vhost_user_net( test_vhost_user_net(
Some("vunet-tap0"), Some("vunet-tap0"),
@ -1333,12 +1335,12 @@ mod tests {
) )
} }
#[cfg_attr(not(feature = "mmio"), test)] #[test]
fn test_vhost_user_net_multiple_queues() { fn test_vhost_user_net_multiple_queues() {
test_vhost_user_net(None, 4, Some(&prepare_vhost_user_net_daemon), false) test_vhost_user_net(None, 4, Some(&prepare_vhost_user_net_daemon), false)
} }
#[cfg_attr(not(feature = "mmio"), test)] #[test]
fn test_vhost_user_net_tap_multiple_queues() { fn test_vhost_user_net_tap_multiple_queues() {
test_vhost_user_net( test_vhost_user_net(
Some("vunet-tap1"), Some("vunet-tap1"),
@ -1348,7 +1350,7 @@ mod tests {
) )
} }
#[cfg_attr(not(feature = "mmio"), test)] #[test]
fn test_vhost_user_net_self_spawning() { fn test_vhost_user_net_self_spawning() {
test_vhost_user_net(None, 4, None, true) test_vhost_user_net(None, 4, None, true)
} }