diff mbox

[v2,02/22] iotests: Do not redirect qemu's stderr

Message ID 1423507124-29809-3-git-send-email-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz Feb. 9, 2015, 6:38 p.m. UTC
Redirecting qemu's stderr to stdout makes working with the stderr output
difficult due to the other file descriptor magic performed in
_launch_qemu ("ambiguous redirect").

There is no harm in leaving stderr on stderr, so do it.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
If someone has a better solution, especially regarding the redirection
to a subshell here (test 091) and in the next patch, I'd be very
grateful. All of my efforts to pipe the output of the _launch_qemu
function resulted in said error ("ambiguous redirect"), so I had to keep
it on stderr and I did not find another way to pipe stderr to another
program.
---
 tests/qemu-iotests/091         | 3 ++-
 tests/qemu-iotests/common.qemu | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 32bbd56..caea1ce 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -68,7 +68,8 @@  echo
 echo === Starting QEMU VM2 ===
 echo
 _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk \
-             -incoming "exec: cat '${MIG_FIFO}'"
+             -incoming "exec: cat '${MIG_FIFO}'" \
+    2> >(grep -v 'cat: write error')
 h2=$QEMU_HANDLE
 
 echo
diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
index 4e1996c..5f10c1e 100644
--- a/tests/qemu-iotests/common.qemu
+++ b/tests/qemu-iotests/common.qemu
@@ -155,7 +155,6 @@  function _launch_qemu()
 
     "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest "${@}" \
                                                                 >"${fifo_out}" \
-                                                                2>&1 \
                                                                 <"${fifo_in}" &
     QEMU_PID[${_QEMU_HANDLE}]=$!