[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186 |
Date: |
Tue, 1 Aug 2017 16:46:20 +0200 |
From: Max Reitz <address@hidden>
Without redirecting qemu's stderr to stdout, _filter_qemu will not apply
to warnings. This results in $QEMU_PROG not being replaced by QEMU_PROG
which is not great if your qemu executable is not called
qemu-system-x86_64 (e.g. qemu-system-i386).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/186 | 2 +-
tests/qemu-iotests/186.out | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index ab83ee402a..2b9f618f90 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -56,7 +56,7 @@ function do_run_qemu()
done
fi
echo quit
- ) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor
stdio "$@"
+ ) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor
stdio "$@" 2>&1
echo
}
diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out
index b8bf9a2550..c8377fe146 100644
--- a/tests/qemu-iotests/186.out
+++ b/tests/qemu-iotests/186.out
@@ -442,28 +442,28 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
Cache mode: writeback
(qemu) quit
-qemu-system-x86_64: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is
deprecated with this machine type
Testing: -drive if=scsi,driver=null-co
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) info block
+(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is
deprecated with this machine type
+info block
scsi0-hd0 (NODE_NAME): null-co:// (null-co)
Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
Cache mode: writeback
(qemu) quit
-qemu-system-x86_64: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is
deprecated with this machine type
Testing: -drive if=scsi,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) info block
+(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is
deprecated with this machine type
+info block
scsi0-cd0: [not inserted]
Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
Removable device: not locked, tray closed
(qemu) quit
-qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: warning:
bus=0,unit=0 is deprecated with this machine type
Testing: -drive if=scsi,driver=null-co,media=cdrom
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) info block
+(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning:
bus=0,unit=0 is deprecated with this machine type
+info block
scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only)
Attached to: /machine/unattached/device[27]/scsi.0/legacy[0]
Removable device: not locked, tray closed
--
2.13.3
- [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186,
Kevin Wolf <=
- [Qemu-devel] [PULL 02/15] iotests: Fix test 156, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 06/15] block: fix dangling bs->explicit_options in block.c, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 04/15] iotests: Check dirty bitmap statistics in 124, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 05/15] iotests: Add test of recent fix to 'qemu-img measure', Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 07/15] block: fix leaks in bdrv_open_driver(), Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 09/15] qemu-iotests: Remove blkdebug.conf after tests, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 13/15] qemu-iotests/063: Fix leaked image, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 10/15] qemu-iotests/141: Fix image cleanup, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 11/15] qemu-iotests/153: Fix leaked scratch images, Kevin Wolf, 2017/08/01
- [Qemu-devel] [PULL 08/15] qemu-iotests/041: Fix leaked scratch images, Kevin Wolf, 2017/08/01