From 37d51dda5d154bf733a60183c0043c84ae3bcd8a Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 13 Jan 2020 09:39:22 +0100 Subject: [PATCH] qemuxml2*test: Fix hugepages-default-system-size tests Commit v5.10.0-269-g62065a6cb5 moved NUMA validation code to domain definition time and appropriately adjusted affected test cases except for hugepages-default-system-size. And since we don't mock virGetSystemPageSizeKB in our tests, hugepages-default-system-size test would fail on architectures (ppc64le) with default page size other than 4KiB. Signed-off-by: Jiri Denemark Reviewed-by: Pavel Hrdina --- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8af2ba38d3..560a012149 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -946,7 +946,7 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-system-size", NONE); + DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M", NONE); DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 262fc835f5..f7b6022819 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -293,7 +293,7 @@ mymain(void) DO_TEST("pages-dimm-discard", NONE); DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-system-size", NONE); + DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-numa-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-numa-default-dimm", QEMU_CAPS_OBJECT_MEMORY_FILE);