[libvirt] [PATCH 00/12] tests/domaincaps: Use testQemuCapsIterate()

I finally got annoyed enough by the fact that this test program, unlike qemucapabilitiestest and qemucaps2xmltest, is not self-maintaining. The series, as posted to the list, is heavily snipped: grab the full version with $ git fetch https://gitlab.com/abologna/libvirt.git domaincapstest Andrea Bolognani (12): tests/qemucapabilities: Separate inputDir and outputDir tests: testQemuCapsIterate: Don't ignore malformed file names tests: testQemuCapsIterate: Validate suffix tests: testQemuCapsIterate: Pass inputDir to callback tests: testQemuCapsIterate: Pass suffix to callback tests: testQemuCapsIterate: Pass prefix and version to callback tests: Rename domaincapsschemadata/ -> domaincapsdata/ tests/domaincaps: Don't mess with test name tests/domaincaps: Move most of DO_TEST_QEMU() into a function tests/domaincaps: Don't require redundant information tests/domaincaps: Make test matrix programmatic tests/domaincaps: Use testQemuCapsIterate() tests/Makefile.am | 2 +- .../bhyve_basic.x86_64.xml | 0 .../bhyve_fbuf.x86_64.xml | 0 .../bhyve_uefi.x86_64.xml | 0 .../empty.xml | 0 .../libxl-xenfv.xml | 0 .../libxl-xenpv.xml | 0 .../qemu_1.5.3-q35.x86_64.xml} | 4 +- .../qemu_1.5.3-tcg.x86_64.xml} | 6 +- .../qemu_1.5.3.x86_64.xml} | 2 +- .../qemu_1.6.0-q35.x86_64.xml} | 4 +- .../qemu_1.6.0-tcg.x86_64.xml} | 6 +- .../qemu_1.6.0.x86_64.xml} | 2 +- .../qemu_1.7.0-q35.x86_64.xml} | 4 +- .../qemu_1.7.0-tcg.x86_64.xml} | 4 +- .../qemu_1.7.0.x86_64.xml | 0 .../qemu_2.1.1-q35.x86_64.xml} | 7 +- .../qemu_2.1.1-tcg.x86_64.xml} | 9 +- .../qemu_2.1.1.x86_64.xml} | 5 +- .../qemu_2.10.0-q35.x86_64.xml} | 21 +- .../qemu_2.10.0-tcg.x86_64.xml} | 3 +- .../qemu_2.10.0-virt.aarch64.xml} | 3 +- .../qemu_2.10.0.aarch64.xml} | 1 + .../qemu_2.10.0.ppc64.xml} | 2 +- .../qemu_2.10.0.s390x.xml} | 110 ++++----- .../qemu_2.10.0.x86_64.xml} | 21 +- .../qemu_2.11.0-q35.x86_64.xml} | 7 +- .../qemu_2.11.0-tcg.x86_64.xml} | 34 ++- .../qemu_2.11.0.s390x.xml} | 11 +- .../qemu_2.11.0.x86_64.xml} | 7 +- .../qemu_2.12.0-q35.x86_64.xml} | 6 +- .../qemu_2.12.0-tcg.x86_64.xml} | 50 ++-- .../qemu_2.12.0-virt.aarch64.xml | 0 .../qemu_2.12.0.aarch64.xml} | 5 +- .../qemu_2.12.0.ppc64.xml | 0 .../qemu_2.12.0.s390x.xml | 0 .../qemu_2.12.0.x86_64.xml | 0 .../qemu_2.4.0-q35.x86_64.xml} | 4 +- .../qemu_2.4.0-tcg.x86_64.xml} | 6 +- .../qemu_2.4.0.x86_64.xml} | 2 +- .../qemu_2.5.0-q35.x86_64.xml} | 4 +- .../qemu_2.5.0-tcg.x86_64.xml} | 6 +- .../qemu_2.5.0.x86_64.xml} | 2 +- .../qemu_2.6.0-q35.x86_64.xml} | 4 +- .../qemu_2.6.0-tcg.x86_64.xml} | 4 +- .../qemu_2.6.0-virt.aarch64.xml | 0 .../qemu_2.6.0.aarch64.xml | 0 .../qemu_2.6.0.ppc64.xml | 0 .../qemu_2.6.0.x86_64.xml | 0 .../qemu_2.7.0-q35.x86_64.xml} | 5 +- .../qemu_2.7.0-tcg.x86_64.xml} | 7 +- .../qemu_2.7.0.s390x.xml | 0 .../qemu_2.7.0.x86_64.xml} | 3 +- .../qemu_2.8.0-q35.x86_64.xml} | 6 +- .../qemu_2.8.0-tcg.x86_64.xml | 0 .../qemu_2.8.0.s390x.xml | 0 .../qemu_2.8.0.x86_64.xml | 0 .../qemu_2.9.0-q35.x86_64.xml | 0 .../qemu_2.9.0-tcg.x86_64.xml | 0 .../qemu_2.9.0.ppc64.xml} | 2 +- .../qemu_2.9.0.s390x.xml} | 7 +- .../qemu_2.9.0.x86_64.xml | 0 .../qemu_3.0.0-q35.x86_64.xml} | 11 +- .../qemu_3.0.0-tcg.x86_64.xml} | 52 +++-- .../qemu_3.0.0.ppc64.xml} | 3 +- .../qemu_3.0.0.s390x.xml | 0 .../qemu_3.0.0.x86_64.xml} | 7 +- .../qemu_3.1.0-q35.x86_64.xml} | 6 +- .../qemu_3.1.0-tcg.x86_64.xml} | 55 +++-- .../qemu_3.1.0.ppc64.xml} | 3 +- .../qemu_3.1.0.x86_64.xml | 0 .../qemu_4.0.0-q35.x86_64.xml} | 6 +- .../qemu_4.0.0-tcg.x86_64.xml} | 55 +++-- .../qemu_4.0.0-virt.aarch64.xml} | 16 +- .../qemu_4.0.0.aarch64.xml} | 2 +- .../qemu_4.0.0.ppc64.xml} | 2 +- .../qemu_4.0.0.s390x.xml | 0 .../qemu_4.0.0.x86_64.xml | 0 .../qemu_4.1.0-q35.x86_64.xml} | 6 +- .../qemu_4.1.0-tcg.x86_64.xml} | 59 +++-- .../qemu_4.1.0.x86_64.xml | 0 .../qemu_4.2.0-q35.x86_64.xml} | 6 +- .../qemu_4.2.0-tcg.x86_64.xml} | 59 +++-- .../qemu_4.2.0-virt.aarch64.xml} | 14 +- .../qemu_4.2.0.aarch64.xml | 0 .../qemu_4.2.0.ppc64.xml | 0 .../qemu_4.2.0.x86_64.xml | 0 tests/domaincapstest.c | 221 ++++++++---------- .../caps_1.5.3.x86_64.xml | 2 +- .../caps_1.6.0.x86_64.xml | 2 +- .../caps_1.7.0.x86_64.xml | 2 +- .../caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.xml | 2 +- .../caps_2.10.0.ppc64.xml | 2 +- .../caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.xml | 2 +- .../caps_2.11.0.s390x.xml | 2 +- .../caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.xml | 2 +- .../caps_2.4.0.x86_64.xml | 2 +- .../caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../caps_2.9.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 +- .../caps_3.0.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 +- .../caps_3.1.0.x86_64.xml | 2 +- .../caps_4.0.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 +- .../caps_4.0.0.x86_64.xml | 2 +- .../caps_4.1.0.x86_64.xml | 2 +- .../caps_4.2.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 +- .../caps_4.2.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 40 ++-- tests/qemucaps2xmltest.c | 22 +- tests/testutilsqemu.c | 41 +++- tests/testutilsqemu.h | 5 +- tests/virschematest.c | 2 +- 132 files changed, 645 insertions(+), 524 deletions(-) rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_basic.x86_64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_fbuf.x86_64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_uefi.x86_64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/empty.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/libxl-xenfv.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/libxl-xenpv.xml (100%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.5.3-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.5.3-tcg.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.5.3.x86_64.xml} (99%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.6.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.6.0-tcg.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.6.0.x86_64.xml} (99%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.7.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_1.7.0-tcg.x86_64.xml} (98%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_1.7.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_2.1.1-q35.x86_64.xml} (96%) copy tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_2.1.1-tcg.x86_64.xml} (95%) rename tests/{domaincapsschemadata/qemu_1.7.0.x86_64.xml => domaincapsdata/qemu_2.1.1.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml => domaincapsdata/qemu_2.10.0-q35.x86_64.xml} (87%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_2.10.0-tcg.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml => domaincapsdata/qemu_2.10.0-virt.aarch64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.6.0.aarch64.xml => domaincapsdata/qemu_2.10.0.aarch64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.12.0.ppc64.xml => domaincapsdata/qemu_2.10.0.ppc64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.12.0.s390x.xml => domaincapsdata/qemu_2.10.0.s390x.xml} (96%) copy tests/{domaincapsschemadata/qemu_2.9.0.x86_64.xml => domaincapsdata/qemu_2.10.0.x86_64.xml} (87%) copy tests/{domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml => domaincapsdata/qemu_2.11.0-q35.x86_64.xml} (95%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_2.11.0-tcg.x86_64.xml} (84%) copy tests/{domaincapsschemadata/qemu_2.12.0.s390x.xml => domaincapsdata/qemu_2.11.0.s390x.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.9.0.x86_64.xml => domaincapsdata/qemu_2.11.0.x86_64.xml} (95%) copy tests/{domaincapsschemadata/qemu_2.12.0.x86_64.xml => domaincapsdata/qemu_2.12.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_2.12.0-tcg.x86_64.xml} (78%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0-virt.aarch64.xml (100%) copy tests/{domaincapsschemadata/qemu_2.6.0.aarch64.xml => domaincapsdata/qemu_2.12.0.aarch64.xml} (95%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.ppc64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.s390x.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.4.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.4.0-tcg.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.4.0.x86_64.xml} (99%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.5.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.5.0-tcg.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.5.0.x86_64.xml} (99%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.6.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.6.0-tcg.x86_64.xml} (98%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0-virt.aarch64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.aarch64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.ppc64.xml (100%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.7.0-q35.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.7.0-tcg.x86_64.xml} (96%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.7.0.s390x.xml (100%) rename tests/{domaincapsschemadata/qemu_2.6.0.x86_64.xml => domaincapsdata/qemu_2.7.0.x86_64.xml} (97%) copy tests/{domaincapsschemadata/qemu_2.8.0.x86_64.xml => domaincapsdata/qemu_2.8.0-q35.x86_64.xml} (98%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0-tcg.x86_64.xml (100%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0.s390x.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0.x86_64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0-q35.x86_64.xml (100%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0-tcg.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_2.12.0.ppc64.xml => domaincapsdata/qemu_2.9.0.ppc64.xml} (98%) rename tests/{domaincapsschemadata/qemu_2.8.0.s390x.xml => domaincapsdata/qemu_2.9.0.s390x.xml} (97%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_4.0.0.x86_64.xml => domaincapsdata/qemu_3.0.0-q35.x86_64.xml} (95%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_3.0.0-tcg.x86_64.xml} (78%) rename tests/{domaincapsschemadata/qemu_2.12.0.ppc64.xml => domaincapsdata/qemu_3.0.0.ppc64.xml} (97%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_3.0.0.s390x.xml (100%) copy tests/{domaincapsschemadata/qemu_4.0.0.x86_64.xml => domaincapsdata/qemu_3.0.0.x86_64.xml} (95%) copy tests/{domaincapsschemadata/qemu_3.1.0.x86_64.xml => domaincapsdata/qemu_3.1.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_3.1.0-tcg.x86_64.xml} (77%) copy tests/{domaincapsschemadata/qemu_4.2.0.ppc64.xml => domaincapsdata/qemu_3.1.0.ppc64.xml} (97%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_3.1.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_4.0.0.x86_64.xml => domaincapsdata/qemu_4.0.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_4.0.0-tcg.x86_64.xml} (77%) copy tests/{domaincapsschemadata/qemu_4.2.0.aarch64.xml => domaincapsdata/qemu_4.0.0-virt.aarch64.xml} (95%) copy tests/{domaincapsschemadata/qemu_4.2.0.aarch64.xml => domaincapsdata/qemu_4.0.0.aarch64.xml} (100%) copy tests/{domaincapsschemadata/qemu_4.2.0.ppc64.xml => domaincapsdata/qemu_4.0.0.ppc64.xml} (98%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.0.0.s390x.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.0.0.x86_64.xml (100%) copy tests/{domaincapsschemadata/qemu_4.1.0.x86_64.xml => domaincapsdata/qemu_4.1.0-q35.x86_64.xml} (98%) copy tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_4.1.0-tcg.x86_64.xml} (75%) copy tests/{domaincapsschemadata => domaincapsdata}/qemu_4.1.0.x86_64.xml (100%) rename tests/{domaincapsschemadata/qemu_4.1.0.x86_64.xml => domaincapsdata/qemu_4.2.0-q35.x86_64.xml} (98%) rename tests/{domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml => domaincapsdata/qemu_4.2.0-tcg.x86_64.xml} (75%) copy tests/{domaincapsschemadata/qemu_4.2.0.aarch64.xml => domaincapsdata/qemu_4.2.0-virt.aarch64.xml} (95%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.aarch64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.ppc64.xml (100%) rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.x86_64.xml (100%) -- 2.21.0