On Fri, 2016-04-15 at 10:20 +0200, Boris Fiuczynski wrote:
Adding tests for the panic device model s390.
The commit message doesn't add any information that the summary didn't contain already. Just drop it.
Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> --- tests/qemuxml2argvdata/qemuxml2argv-panic-s390.xml | 22 ++++++++++++++++ .../qemuxml2argv-s390-panic-address.xml | 26 +++++++++++++++++++ .../qemuxml2argv-s390-panic-missing.args | 25 +++++++++++++++++++ .../qemuxml2argv-s390-panic-missing.xml | 23 +++++++++++++++++ .../qemuxml2argv-s390-panic-no-address.args | 25 +++++++++++++++++++ .../qemuxml2argv-s390-panic-no-address.xml | 24 ++++++++++++++++++ tests/qemuxml2argvtest.c | 11 +++++++- .../qemuxml2xmlout-panic-s390.xml | 28 +++++++++++++++++++++ .../qemuxml2xmlout-s390-panic-missing.xml | 29 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 +++ 10 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-panic-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-missing.xml
Please use "s390-panic" instead of "panic-s390" to be consistent with both the existing test cases and the ones you're adding yourself. You could test "s390-panic-no-address" in the xml2xml case as well. For all test cases, please try to use symbolic links whenever possible, eg. you should be able to take the output XML that contains <panic model='s390'/> and use it as input file for the same xml2xml test and for at least one of the xml2argv tests.
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f4093f1..4f3faee 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -686,6 +686,10 @@ mymain(void) DO_TEST_FULL("s390-defaultconsole", WHEN_ACTIVE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_FULL("panic-s390", WHEN_ACTIVE, + QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_FULL("s390-panic-missing", WHEN_ACTIVE, + QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
I see you need QEMU_CAPS_VIRTIO_CCW and QEMU_CAPS_VIRTIO_S390, so you can't just use DO_TEST(). Still, no reason not to use WHEN_BOTH, right? I tried to use it and the tests still passed. Other s390 test cases could probably be switched to WHEN_BOTH in a follow-up commit. -- Andrea Bolognani Software Engineer - Virtualization Team