summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWei Jiangang2016-04-26 12:13:21 +0200
committerMax Reitz2016-05-12 15:33:23 +0200
commit9036e87c7437388365a419a5f26445eb7809b941 (patch)
tree89b22f4d86b3cea59748eb27826291e9d6cb4b81 /tests
parentblock: Inactivate all children (diff)
downloadqemu-9036e87c7437388365a419a5f26445eb7809b941.tar.gz
qemu-9036e87c7437388365a419a5f26445eb7809b941.tar.xz
qemu-9036e87c7437388365a419a5f26445eb7809b941.zip
iotests: fix the redirection order in 083
It should redirect stdout to /dev/null first, then redirect stderr to whatever stdout currently points at. Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com> Message-id: 1461665601-14908-1-git-send-email-weijg.fnst@cn.fujitsu.com Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/0834
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index bc724ae058..bff9360048 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -43,7 +43,7 @@ choose_tcp_port() {
wait_for_tcp_port() {
while ! (netstat --tcp --listening --numeric | \
- grep "$1.*0\\.0\\.0\\.0:\\*.*LISTEN") 2>&1 >/dev/null; do
+ grep "$1.*0\\.0\\.0\\.0:\\*.*LISTEN") >/dev/null 2>&1; do
sleep 0.1
done
}
@@ -70,7 +70,7 @@ EOF
nbd_url="nbd:127.0.0.1:$port:exportname=foo"
fi
- $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
+ $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" >/dev/null 2>&1 &
wait_for_tcp_port "127\\.0\\.0\\.1:$port"
$QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | _filter_nbd