From: Peter Krempa Date: Thu, 22 Jul 2021 08:27:11 +0000 (+0200) Subject: qemuxml2argvtest: Remove negative tests for (aes|dea)keywrap (s390) property X-Git-Tag: v7.7.0-rc1~168 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c678f2d61b195d9df017f912ff267d438536fbf5;p=thirdparty%2Flibvirt.git qemuxml2argvtest: Remove negative tests for (aes|dea)keywrap (s390) property Upcoming commit will always add the property so the negative tests would stop working. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander Reviewed-by: Ján Tomko --- diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.err b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.err deleted file mode 100644 index 8b774a8a2a..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: aes-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.err b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.err deleted file mode 100644 index 8b774a8a2a..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: aes-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.err b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.err deleted file mode 100644 index 8b774a8a2a..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: aes-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.err b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.err deleted file mode 100644 index 8b774a8a2a..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: aes-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.err b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.err deleted file mode 100644 index c33833f620..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: dea-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.err b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.err deleted file mode 100644 index c33833f620..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: dea-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.err b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.err deleted file mode 100644 index c33833f620..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: dea-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.err b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.err deleted file mode 100644 index c33833f620..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: dea-key-wrap is not available with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2754a8a780..2d99fe1bec 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3139,65 +3139,41 @@ mymain(void) QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-aeskeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-on-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-aeskeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-aeskeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-aeskeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-deakeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-deakeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-deakeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); - DO_TEST_FAILURE("machine-deakeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); DO_TEST("machine-keywrap-none-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,