]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuxml2*test: Fix hugepages-default-system-size tests
authorJiri Denemark <jdenemar@redhat.com>
Mon, 13 Jan 2020 08:39:22 +0000 (09:39 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 13 Jan 2020 11:52:06 +0000 (12:52 +0100)
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 <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
tests/qemuxml2argvtest.c
tests/qemuxml2xmltest.c

index 8af2ba38d3f3420ee3bb0be1be6dc43171e7062e..560a012149085957d147dd6f758c257b0c446cc5 100644 (file)
@@ -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",
index 262fc835f5ca1a3238b069c68c249c41db2fab25..f7b60228197e52afcda4591671b8b6687615c735 100644 (file)
@@ -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);