From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vej6g-0008Ot-Is for qemu-devel@nongnu.org; Fri, 08 Nov 2013 05:16:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vej6Z-0006rO-Io for qemu-devel@nongnu.org; Fri, 08 Nov 2013 05:16:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vej6Z-0006rD-7a for qemu-devel@nongnu.org; Fri, 08 Nov 2013 05:15:55 -0500 From: Stefan Hajnoczi Date: Fri, 8 Nov 2013 11:12:28 +0100 Message-Id: <1383905551-16411-35-git-send-email-stefanha@redhat.com> In-Reply-To: <1383905551-16411-1-git-send-email-stefanha@redhat.com> References: <1383905551-16411-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL v2 34/37] block: vhdx - update _make_test_img() to filter out vhdx options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jeff Cody , Stefan Hajnoczi , Anthony Liguori From: Jeff Cody The non-global option output is suppresed in _make_test_img() for output verification in the 0?? tests. This adds suppression for the vhdx-unique options as well. This allows check -vhdx to run successfully. Signed-off-by: Jeff Cody Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/common.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index d24de2c..7f62457 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -157,7 +157,10 @@ _make_test_img() -e "s# zeroed_grain=\\(on\\|off\\)##g" \ -e "s# subformat='[^']*'##g" \ -e "s# adapter_type='[^']*'##g" \ - -e "s# lazy_refcounts=\\(on\\|off\\)##g" + -e "s# lazy_refcounts=\\(on\\|off\\)##g" \ + -e "s# block_size=[0-9]\\+##g" \ + -e "s# block_state_zero=\\(on\\|off\\)##g" \ + -e "s# log_size=[0-9]\\+##g" # Start an NBD server on the image file, which is what we'll be talking to if [ $IMGPROTO = "nbd" ]; then -- 1.8.3.1