69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
|
From ae868555000f3f9a37df2faf2551825381a86b45 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 25 Mar 2024 10:07:25 +0000
|
||
|
|
Subject: [PATCH] qemu-iotests: Discard stderr when probing devices
|
||
|
|
mainline inclusion
|
||
|
|
commit e13fe274bfbc4c5b338854a3519a64b84c2d5517
|
||
|
|
category: bugfix
|
||
|
|
|
||
|
|
---------------------------------------------------------------
|
||
|
|
|
||
|
|
qemu-iotests fails in the following setup:
|
||
|
|
|
||
|
|
./configure --enable-modules --enable-smartcard \
|
||
|
|
--target-list=x86_64-softmmu,s390x-softmmu
|
||
|
|
make
|
||
|
|
cd build
|
||
|
|
QEMU_PROG=`pwd`/s390x-softmmu/qemu-system-s390x \
|
||
|
|
../tests/check-block.sh qcow2
|
||
|
|
...
|
||
|
|
--- /home/crobinso/src/qemu/tests/qemu-iotests/127.out
|
||
|
|
+++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/127.out.bad
|
||
|
|
//@@ -1,4 +1,18 @@
|
||
|
|
QA output created by 127
|
||
|
|
+Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
|
||
|
|
...
|
||
|
|
--- /home/crobinso/src/qemu/tests/qemu-iotests/267.out
|
||
|
|
+++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/267.out.bad
|
||
|
|
//@@ -1,4 +1,11 @@
|
||
|
|
QA output created by 267
|
||
|
|
+Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
|
||
|
|
|
||
|
|
The stderr spew is its own known issue, but seems like iotests should
|
||
|
|
be discarding stderr in this case.
|
||
|
|
|
||
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
tests/qemu-iotests/common.rc | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
||
|
|
index d8582454de..4c468675d3 100644
|
||
|
|
--- a/tests/qemu-iotests/common.rc
|
||
|
|
+++ b/tests/qemu-iotests/common.rc
|
||
|
|
@@ -973,7 +973,7 @@ _require_large_file()
|
||
|
|
#
|
||
|
|
_require_devices()
|
||
|
|
{
|
||
|
|
- available=$($QEMU -M none -device help | \
|
||
|
|
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
||
|
|
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
||
|
|
for device
|
||
|
|
do
|
||
|
|
@@ -985,7 +985,7 @@ _require_devices()
|
||
|
|
|
||
|
|
_require_one_device_of()
|
||
|
|
{
|
||
|
|
- available=$($QEMU -M none -device help | \
|
||
|
|
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
||
|
|
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
||
|
|
for device
|
||
|
|
do
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|