[PATCH 01/18] iotests: Filter refcount_order in 036

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH 01/18] iotests: Filter refcount_order in 036
Date: Fri, 27 Sep 2019 11:42:25 +0200	[thread overview]
Message-ID: <20190927094242.11152-2-mreitz@redhat.com> (raw)
In-Reply-To: <20190927094242.11152-1-mreitz@redhat.com>

This test can run just fine with other values for refcount_bits, so we
should filter the value from qcow2.py's dump-header.

(036 currently ignores user-specified image options, but that will be
fixed in the next patch.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/036     | 9 ++++++---
 tests/qemu-iotests/036.out | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index f06ff67408..69d0f9f903 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
 
 # Without feature table
 $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+    | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
 _img_info
 
 # With feature table containing bit 63
@@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
 echo
 _make_test_img 64M
 $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+    | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
 
 echo
 echo === Repair image ===
 echo
 _check_test_img -r all
 
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+    | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
 
 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index e489b44386..998c2a8a35 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -19,7 +19,7 @@ snapshot_offset           0x0
 incompatible_features     0x8000000000000000
 compatible_features       0x0
 autoclear_features        0x0
-refcount_order            4
+refcount_order            (filtered)
 header_length             104
 
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
@@ -53,7 +53,7 @@ snapshot_offset           0x0
 incompatible_features     0x0
 compatible_features       0x0
 autoclear_features        0x8000000000000000
-refcount_order            4
+refcount_order            (filtered)
 header_length             104
 
 Header extension:
@@ -81,7 +81,7 @@ snapshot_offset           0x0
 incompatible_features     0x0
 compatible_features       0x0
 autoclear_features        0x0
-refcount_order            4
+refcount_order            (filtered)
 header_length             104
 
 Header extension:
-- 
2.21.0

next prev parent reply	other threads:[~2019-09-27  9:45 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-27  9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
2019-09-27  9:42 ` Max Reitz [this message]
2019-09-29 16:31   ` [PATCH 01/18] iotests: Filter refcount_order in 036 Maxim Levitsky
2019-09-30 12:43     ` Max Reitz
2019-09-30 13:40       ` Maxim Levitsky
2019-09-30 13:44         ` Max Reitz
2019-09-30 13:58           ` Maxim Levitsky
2019-09-30 14:04             ` Max Reitz
2019-09-30 14:14               ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2019-09-29 16:31   ` Maxim Levitsky
2019-09-30 12:59     ` Max Reitz
2019-09-30 14:47       ` Maxim Levitsky
2019-09-30 14:59         ` Max Reitz
2019-09-27  9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
2019-09-29 16:32   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
2019-09-29 16:32   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2019-09-29 16:32   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2019-09-29 16:32   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-30 13:00     ` Max Reitz
2019-09-30 14:30       ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-30 13:01     ` Max Reitz
2019-09-30 14:32       ` Maxim Levitsky
2019-09-30 15:01         ` Max Reitz
2019-09-30 15:06           ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
2019-09-29 16:33   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
2019-09-29 16:34   ` Maxim Levitsky
2019-09-30 13:07     ` Max Reitz
2019-09-27  9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
2019-09-29 16:34   ` Maxim Levitsky
2019-09-30 13:34     ` Max Reitz
2019-09-30 13:41       ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
2019-09-29 16:38   ` Maxim Levitsky
2019-09-30 13:38     ` Max Reitz
2019-09-30 13:46       ` Maxim Levitsky
2019-09-30 13:57         ` Max Reitz
2019-09-30 14:06           ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
2019-09-29 16:38   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
2019-09-29 16:39   ` Maxim Levitsky
2019-09-27  9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
2019-09-29 16:39   ` Maxim Levitsky
2019-09-30 13:43     ` Max Reitz

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f06ff6740 dfblob:69d0f9f90 dfblob:e489b4438 dfblob:998c2a8a3 )
 OR (
bs:"[PATCH 01/18] iotests: Filter refcount_order in 036" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190927094242.11152-2-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).