mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 13:05:45 +00:00
tests: Only use bzImage in integration tests that require it
i.e. test_bzimage_boot and test_bzimage_reboot Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
5c7164e55f
commit
9a8a34a8a9
@ -2206,8 +2206,7 @@ mod tests {
|
|||||||
let mut workload_path = dirs::home_dir().unwrap();
|
let mut workload_path = dirs::home_dir().unwrap();
|
||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut kernel_path = workload_path;
|
let kernel_path = direct_kernel_boot_path();
|
||||||
kernel_path.push("bzImage");
|
|
||||||
|
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut child = GuestCommand::new(&guest)
|
||||||
.args(&["--cpus", "boot=1"])
|
.args(&["--cpus", "boot=1"])
|
||||||
@ -2290,8 +2289,7 @@ mod tests {
|
|||||||
let mut workload_path = dirs::home_dir().unwrap();
|
let mut workload_path = dirs::home_dir().unwrap();
|
||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut kernel_path = workload_path;
|
let kernel_path = direct_kernel_boot_path();
|
||||||
kernel_path.push("bzImage");
|
|
||||||
|
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut child = GuestCommand::new(&guest)
|
||||||
.args(&["--cpus", "boot=6"])
|
.args(&["--cpus", "boot=6"])
|
||||||
@ -3430,8 +3428,7 @@ mod tests {
|
|||||||
let mut workload_path = dirs::home_dir().unwrap();
|
let mut workload_path = dirs::home_dir().unwrap();
|
||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut kernel_path = workload_path.clone();
|
let kernel_path = direct_kernel_boot_path();
|
||||||
kernel_path.push("bzImage");
|
|
||||||
|
|
||||||
let mut vfio_path = workload_path.clone();
|
let mut vfio_path = workload_path.clone();
|
||||||
vfio_path.push("vfio");
|
vfio_path.push("vfio");
|
||||||
@ -3982,8 +3979,7 @@ mod tests {
|
|||||||
let mut workload_path = dirs::home_dir().unwrap();
|
let mut workload_path = dirs::home_dir().unwrap();
|
||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut kernel_path = workload_path;
|
let kernel_path = direct_kernel_boot_path();
|
||||||
kernel_path.push("bzImage");
|
|
||||||
|
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut child = GuestCommand::new(&guest)
|
||||||
.args(&["--cpus", "boot=1"])
|
.args(&["--cpus", "boot=1"])
|
||||||
@ -5036,8 +5032,7 @@ mod tests {
|
|||||||
let mut workload_path = dirs::home_dir().unwrap();
|
let mut workload_path = dirs::home_dir().unwrap();
|
||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut kernel_path = workload_path;
|
let kernel_path = direct_kernel_boot_path();
|
||||||
kernel_path.push("bzImage");
|
|
||||||
|
|
||||||
let api_socket = temp_api_path(&guest.tmp_dir);
|
let api_socket = temp_api_path(&guest.tmp_dir);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user