From 98ce0a262f9b19a452e202e01ca84584079d22f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 20 Nov 2013 19:44:06 +0100 Subject: [PATCH 23/25] block: vhdx - update _make_test_img() to filter out vhdx options RH-Author: Jeffrey Cody Message-id: <8632a15d525b341bea089780916ffab61f44a34f.1384975172.git.jcody@redhat.com> Patchwork-id: 55816 O-Subject: [RHEL7 qemu-kvm PATCH 23/26] block: vhdx - update _make_test_img() to filter out vhdx options Bugzilla: 879234 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Paolo Bonzini RH-Acked-by: Fam Zheng 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 (cherry picked from commit 228b234dd73383408743d749d29a6c37e9d99981) --- tests/qemu-iotests/common.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Signed-off-by: Miroslav Rezanina --- tests/qemu-iotests/common.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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.7.1