From 9dcde11f25f85804f31d00fc45eed16595aebeec Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 18 Sep 2013 10:31:44 +0200 Subject: [PATCH 38/38] qemu-iotests: Remove lsi53c895a tests from 051 Message-id: <1379499002-5231-7-git-send-email-mreitz@redhat.com> Patchwork-id: 54437 O-Subject: [RHEL-7.0 qemu-kvm PATCH 6/6] qemu-iotests: Remove lsi53c895a tests from 051 Bugzilla: 1006959 RH-Acked-by: Markus Armbruster RH-Acked-by: Fam Zheng RH-Acked-by: Kevin Wolf BZ: 1006959 Upstream: N/A, RHEL-only LSI SCSI is disabled in RHEL7, the corresponding checks in 051 are therefore bound to fail. This patch removes these checks and their expected output from test 051. Signed-off-by: Max Reitz --- tests/qemu-iotests/051 | 20 +++++++++--------- tests/qemu-iotests/051.out | 47 -------------------------------------------- 2 files changed, 10 insertions(+), 57 deletions(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 1f39c6a..93a2797 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -94,19 +94,19 @@ echo run_qemu -drive if=floppy run_qemu -drive if=ide,media=cdrom -run_qemu -drive if=scsi,media=cdrom +#run_qemu -drive if=scsi,media=cdrom run_qemu -drive if=ide run_qemu -drive if=virtio -run_qemu -drive if=scsi +#run_qemu -drive if=scsi run_qemu -drive if=none,id=disk -device ide-cd,drive=disk -run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk +#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk run_qemu -drive if=none,id=disk -device ide-drive,drive=disk run_qemu -drive if=none,id=disk -device ide-hd,drive=disk -run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk -run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk +#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk +#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk echo echo === Read-only === @@ -114,19 +114,19 @@ echo run_qemu -drive file=$TEST_IMG,if=floppy,readonly=on run_qemu -drive file=$TEST_IMG,if=ide,media=cdrom,readonly=on -run_qemu -drive file=$TEST_IMG,if=scsi,media=cdrom,readonly=on +#run_qemu -drive file=$TEST_IMG,if=scsi,media=cdrom,readonly=on run_qemu -drive file=$TEST_IMG,if=ide,readonly=on run_qemu -drive file=$TEST_IMG,if=virtio,readonly=on -run_qemu -drive file=$TEST_IMG,if=scsi,readonly=on +#run_qemu -drive file=$TEST_IMG,if=scsi,readonly=on run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-cd,drive=disk -run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk +#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-drive,drive=disk run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-hd,drive=disk -run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk -run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk +#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk +#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk echo echo === Cache modes === diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index 5582ed3..e3cf244 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -65,10 +65,6 @@ Testing: -drive if=ide,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive if=scsi,media=cdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - Testing: -drive if=ide QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: Device needs media, but drive is empty @@ -82,21 +78,10 @@ QEMU_PROG: -drive if=virtio: Device initialization failed. QEMU_PROG: -drive if=virtio: Device initialization failed. QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized -Testing: -drive if=scsi -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty -QEMU_PROG: -drive if=scsi: Device initialization failed. -QEMU_PROG: Device initialization failed. -QEMU_PROG: Initialization of device lsi53c895a failed - Testing: -drive if=none,id=disk -device ide-cd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - Testing: -drive if=none,id=disk -device ide-drive,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty @@ -109,18 +94,6 @@ QEMU X.Y.Z monitor - type 'help' for more information QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed. QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized -Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-disk,drive=disk: Device needs media, but drive is empty -QEMU_PROG: -device scsi-disk,drive=disk: Device initialization failed. -QEMU_PROG: -device scsi-disk,drive=disk: Device 'scsi-disk' could not be initialized - -Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-hd,drive=disk: Device needs media, but drive is empty -QEMU_PROG: -device scsi-hd,drive=disk: Device initialization failed. -QEMU_PROG: -device scsi-hd,drive=disk: Device 'scsi-hd' could not be initialized - === Read-only === @@ -132,10 +105,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: read-only not supported by this bus type @@ -143,18 +112,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-cd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-drive,drive=disk: Can't use a read-only drive @@ -167,14 +128,6 @@ QEMU X.Y.Z monitor - type 'help' for more information QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed. QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized -Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - -Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qququiquit - === Cache modes === -- 1.7.1