From c85c1f0d768f169c768ec8ee61b31d614f67ff5f Mon Sep 17 00:00:00 2001 From: Henry Wang Date: Fri, 18 Sep 2020 13:16:06 +0000 Subject: [PATCH] ci: AArch64: enable snapshot/restore integration test case Signed-off-by: Henry Wang --- scripts/run_integration_tests_aarch64.sh | 2 +- tests/integration.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 82f963924..284e3f438 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -206,7 +206,7 @@ sudo bash -c "echo 1 > /sys/kernel/mm/ksm/run" sudo adduser $USER kvm newgrp kvm << EOF export RUST_BACKTRACE=1 -time cargo test --no-default-features --features "integration_tests,pci,kvm" "tests::parallel::$@" +time cargo test --no-default-features --features "integration_tests,pci,kvm" "tests::parallel::$@" -- --skip test_snapshot_restore EOF RES=$? diff --git a/tests/integration.rs b/tests/integration.rs index acd8ec2d9..145570068 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -5018,7 +5018,6 @@ 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); @@ -5026,7 +5025,10 @@ 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);