From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxQnf-00082J-2l for qemu-devel@nongnu.org; Sun, 29 Dec 2013 19:33:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VxQna-0005l4-6k for qemu-devel@nongnu.org; Sun, 29 Dec 2013 19:33:43 -0500 Received: from smtp.dmail.dachary.org ([91.121.254.229]:39067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxQna-0005kb-1H for qemu-devel@nongnu.org; Sun, 29 Dec 2013 19:33:38 -0500 From: Loic Dachary Date: Mon, 30 Dec 2013 01:33:34 +0100 Message-Id: <1388363614-25411-1-git-send-email-loic@dachary.org> Subject: [Qemu-devel] [PATCH] discard rbd error output when not relevant in qemu-iotests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org Stash the rbd stderr and stdout because it also contains human readable progress messages : Removing image: 3% complete... in addition to potential error messages. Display the stashed output if rbd exits on error. Signed-off-by: Loic Dachary --- tests/qemu-iotests/common.rc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 28ba0d9..af66bbd 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -189,7 +189,11 @@ _cleanup_test_img() ;; rbd) - rbd rm "$TEST_DIR/t.$IMGFMT" > /dev/null + if ! rbd rm "$TEST_DIR/t.$IMGFMT" > $TEST_DIR/rbd.out 2>&1 + then + cat $TEST_DIR/rbd.out + fi + rm $TEST_DIR/rbd.out ;; sheepdog) -- 1.8.3.2