[PATCH 22/51] qemuxml2argvtest: Modernize negative testing for hugepages
Use proper version for negative case of 'hugepages-memaccess3'
QEMU allowed to configure a memory backend for default ram since
qemu-5.2. Fix the test to use real capability data.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...rr => hugepages-default-1G-nodeset-2M.x86_64-latest.err} | 0
...id.err => hugepages-memaccess-invalid.x86_64-latest.err} | 0
...memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} | 0
tests/qemuxml2argvtest.c | 6 +++---
4 files changed, 3 insertions(+), 3 deletions(-)
rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err =>
hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err =>
hugepages-memaccess-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-memaccess3.err =>
hugepages-memaccess3.x86_64-5.1.0.err} (100%)
diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err
b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err
rename to tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.err
b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.err
rename to tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.err
b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/hugepages-memaccess3.err
rename to tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0a217949b8..a6d569e0c6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1137,7 +1137,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("hugepages-default-2M");
DO_TEST_CAPS_LATEST("hugepages-default-system-size");
DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M");
- DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M");
DO_TEST_CAPS_LATEST("hugepages-nodeset");
DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist");
DO_TEST_CAPS_LATEST("hugepages-numa-default");
@@ -1147,10 +1147,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part");
DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist");
DO_TEST_CAPS_LATEST("hugepages-shared");
- DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-memaccess-invalid");
DO_TEST_CAPS_LATEST("hugepages-memaccess");
DO_TEST_CAPS_LATEST("hugepages-memaccess2");
- DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess3");
+ DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0");
DO_TEST_CAPS_LATEST("hugepages-memaccess3");
DO_TEST_CAPS_LATEST("hugepages-nvdimm");
DO_TEST_NOCAPS("nosharepages");
--
2.41.0