From 9a8a34a8a913f76b553d2b3461c2ada67a20d380 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Tue, 6 Apr 2021 10:51:07 +0100 Subject: [PATCH] tests: Only use bzImage in integration tests that require it i.e. test_bzimage_boot and test_bzimage_reboot Signed-off-by: Rob Bradford --- tests/integration.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index 852c27ca2..0a9aa8d20 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -2206,8 +2206,7 @@ mod tests { let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads"); - let mut kernel_path = workload_path; - kernel_path.push("bzImage"); + let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) .args(&["--cpus", "boot=1"]) @@ -2290,8 +2289,7 @@ mod tests { let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads"); - let mut kernel_path = workload_path; - kernel_path.push("bzImage"); + let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) .args(&["--cpus", "boot=6"]) @@ -3430,8 +3428,7 @@ mod tests { let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads"); - let mut kernel_path = workload_path.clone(); - kernel_path.push("bzImage"); + let kernel_path = direct_kernel_boot_path(); let mut vfio_path = workload_path.clone(); vfio_path.push("vfio"); @@ -3982,8 +3979,7 @@ mod tests { let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads"); - let mut kernel_path = workload_path; - kernel_path.push("bzImage"); + let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) .args(&["--cpus", "boot=1"]) @@ -5036,8 +5032,7 @@ mod tests { let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads"); - let mut kernel_path = workload_path; - kernel_path.push("bzImage"); + let kernel_path = direct_kernel_boot_path(); let api_socket = temp_api_path(&guest.tmp_dir);