From bf5e0280168b09e53124cbf31d0ef9fb05f14db9 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Fri, 4 Sep 2020 12:02:21 +0200 Subject: [PATCH] ci: Update memory zone and NUMA integration tests Since both --memory-zone and --numa parameters have been updated with addition and removal of multiple options, this commit updates the related integration tests to ensure they are still valid. Signed-off-by: Sebastien Boeuf --- tests/integration.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index 7bb0f2cf7..a52802ddf 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -2282,9 +2282,9 @@ mod tests { .args(&["--memory", "size=0"]) .args(&[ "--memory-zone", - "size=1G", - "size=3G,file=/dev/shm", - "size=1G,host_numa_node=0", + "id=mem0,size=1G", + "id=mem1,size=3G,file=/dev/shm", + "id=mem2,size=1G,host_numa_node=0", ]) .args(&["--kernel", guest.fw_path.as_str()]) .capture_output() @@ -2319,15 +2319,15 @@ mod tests { .args(&["--memory", "size=0"]) .args(&[ "--memory-zone", - "size=1G,guest_numa_node=0", - "size=2G,guest_numa_node=1", - "size=3G,guest_numa_node=2", + "id=mem0,size=1G", + "id=mem1,size=2G", + "id=mem2,size=3G", ]) .args(&[ "--numa", - "id=0,cpus=0-2,distances=1@15:2@20", - "id=1,cpus=3-4,distances=0@20:2@25", - "id=2,cpus=5,distances=0@25:1@30", + "id=0,cpus=0-2,distances=1@15:2@20,memory_zones=mem0", + "id=1,cpus=3-4,distances=0@20:2@25,memory_zones=mem1", + "id=2,cpus=5,distances=0@25:1@30,memory_zones=mem2", ]) .args(&["--kernel", guest.fw_path.as_str()]) .capture_output()