[PATCH 01/22] qemuxml2argvtest: Remove negative tests for (aes|dea)keywrap (s390) property
Peter Krempa
pkrempa at redhat.com
Thu Aug 12 14:48:54 UTC 2021
Upcoming commit will always add the property so the negative tests would
stop working.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
.../machine-aeskeywrap-off-cap.err | 1 -
.../machine-aeskeywrap-off-caps.err | 1 -
.../machine-aeskeywrap-on-cap.err | 1 -
.../machine-aeskeywrap-on-caps.err | 1 -
.../machine-deakeywrap-off-cap.err | 1 -
.../machine-deakeywrap-off-caps.err | 1 -
.../machine-deakeywrap-on-cap.err | 1 -
.../machine-deakeywrap-on-caps.err | 1 -
tests/qemuxml2argvtest.c | 24 -------------------
9 files changed, 32 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.err
delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.err
delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.err
delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.err
delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-off-cap.err
delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-off-caps.err
delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-on-cap.err
delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-on-caps.err
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 b552f5deed..ef90f663c1 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,
--
2.31.1
More information about the libvir-list
mailing list