From 4606f0f28a8b3c509c7a342020c043da2076da39 Mon Sep 17 00:00:00 2001 From: Michael Zhao Date: Fri, 30 Oct 2020 08:36:52 +0800 Subject: [PATCH] tests: Make migration test case X86 only Set the test case test_snapshot_restore X86 only, instead of excluding it from test command line. The command line option was added because we used to support migration with Virtio-MMIO, but not Virtio-PCI. Signed-off-by: Michael Zhao --- scripts/run_integration_tests_aarch64.sh | 2 +- tests/integration.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 6cf8c6125..83fbe53e0 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -197,7 +197,7 @@ 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,kvm" "tests::parallel::$@" -- --skip test_snapshot_restore +time cargo test --no-default-features --features "integration_tests,kvm" "tests::parallel::$@" RES=$? # Tear vhost_user_net test network down diff --git a/tests/integration.rs b/tests/integration.rs index b6c507479..428ef4a08 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -5247,6 +5247,7 @@ mod tests { // through each ssh command. There's no need to perform a dedicated test to // verify the migration went well for virtio-net. #[test] + #[cfg(target_arch = "x86_64")] fn test_snapshot_restore() { let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(&mut focal); @@ -5254,10 +5255,7 @@ mod tests { workload_path.push("workloads"); let mut kernel_path = workload_path; - #[cfg(target_arch = "x86_64")] kernel_path.push("bzImage"); - #[cfg(target_arch = "aarch64")] - kernel_path.push("Image"); let api_socket = temp_api_path(&guest.tmp_dir);