Hi,

The cover letter from v1 (explaining the motivation behind this series
and the general structure) is here:

https://lists.nongnu.org/archive/html/qemu-block/2019-09/msg01323.html


For v2, I’ve addressed more of Maxim’s comments:
- Patch 1: Added; Maxim noted this problem on patch 5, but that patch
           doesn’t touch all files that have this mistake, so I decided
           to make it an extra patch

- Patch 20 (now patch 21):
  - Added TODO comments where it would make sense to at some point split
    off some cases into an own test file (so they can run with an
    external data file, where the whole test now has to be skipped)
  - Fixed the reason why we have to skip 138 with external data files
  - Disable 261, too (which was added in the meantime)

- Some contextual differences in some patches due to the $SOCK_DIR
  series

git-backport-diff against v2:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/22:[down] 'iotests: s/qocw2/qcow2/'
002/22:[----] [--] 'iotests/qcow2.py: Add dump-header-exts'
003/22:[----] [--] 'iotests/qcow2.py: Split feature fields into bits'
004/22:[----] [--] 'iotests: Add _filter_json_filename'
005/22:[----] [--] 'iotests: Filter refcount_order in 036'
006/22:[----] [-C] 'iotests: Replace IMGOPTS by _unsupported_imgopts'
007/22:[----] [--] 'iotests: Drop compat=1.1 in 050'
008/22:[----] [--] 'iotests: Let _make_test_img parse its parameters'
009/22:[----] [--] 'iotests: Add -o and --no-opts to _make_test_img'
010/22:[----] [--] 'iotests: Inject space into -ocompat=0.10 in 051'
011/22:[----] [--] 'iotests: Replace IMGOPTS= by -o'
012/22:[----] [--] 'iotests: Replace IMGOPTS='' by --no-opts'
013/22:[----] [-C] 'iotests: Drop IMGOPTS use in 267'
014/22:[----] [--] 'iotests: Avoid qemu-img create'
015/22:[----] [-C] 'iotests: Use _rm_test_img for deleting test images'
016/22:[----] [--] 'iotests: Avoid cp/mv of test images'
017/22:[----] [--] 'iotests: Make 091 work with data_file'
018/22:[----] [--] 'iotests: Make 110 work with data_file'
019/22:[----] [--] 'iotests: Make 137 work with data_file'
020/22:[----] [--] 'iotests: Make 198 work with data_file'
021/22:[0010] [FC] 'iotests: Disable data_file where it cannot be used'
022/22:[----] [-C] 'iotests: Allow check -o data_file'


Max Reitz (22):
  iotests: s/qocw2/qcow2/
  iotests/qcow2.py: Add dump-header-exts
  iotests/qcow2.py: Split feature fields into bits
  iotests: Add _filter_json_filename
  iotests: Filter refcount_order in 036
  iotests: Replace IMGOPTS by _unsupported_imgopts
  iotests: Drop compat=1.1 in 050
  iotests: Let _make_test_img parse its parameters
  iotests: Add -o and --no-opts to _make_test_img
  iotests: Inject space into -ocompat=0.10 in 051
  iotests: Replace IMGOPTS= by -o
  iotests: Replace IMGOPTS='' by --no-opts
  iotests: Drop IMGOPTS use in 267
  iotests: Avoid qemu-img create
  iotests: Use _rm_test_img for deleting test images
  iotests: Avoid cp/mv of test images
  iotests: Make 091 work with data_file
  iotests: Make 110 work with data_file
  iotests: Make 137 work with data_file
  iotests: Make 198 work with data_file
  iotests: Disable data_file where it cannot be used
  iotests: Allow check -o data_file

 tests/qemu-iotests/005           |  2 +-
 tests/qemu-iotests/007           |  5 ++-
 tests/qemu-iotests/014           |  2 +
 tests/qemu-iotests/015           |  5 ++-
 tests/qemu-iotests/019           |  6 +--
 tests/qemu-iotests/020           |  6 +--
 tests/qemu-iotests/024           | 10 ++---
 tests/qemu-iotests/026           |  5 ++-
 tests/qemu-iotests/028           |  2 +-
 tests/qemu-iotests/029           |  7 ++--
 tests/qemu-iotests/031           |  9 ++--
 tests/qemu-iotests/031.out       | 36 ++++++++--------
 tests/qemu-iotests/036           | 15 ++++---
 tests/qemu-iotests/036.out       | 66 ++++-------------------------
 tests/qemu-iotests/039           | 27 +++++-------
 tests/qemu-iotests/039.out       | 22 +++++-----
 tests/qemu-iotests/043           |  4 +-
 tests/qemu-iotests/046           |  2 +
 tests/qemu-iotests/048           |  4 +-
 tests/qemu-iotests/050           |  8 +---
 tests/qemu-iotests/051           |  7 ++--
 tests/qemu-iotests/053           |  4 +-
 tests/qemu-iotests/058           |  7 ++--
 tests/qemu-iotests/059           | 20 ++++-----
 tests/qemu-iotests/060           | 14 ++++---
 tests/qemu-iotests/060.out       | 20 ++++-----
 tests/qemu-iotests/061           | 63 +++++++++++++++-------------
 tests/qemu-iotests/061.out       | 72 ++++++++++++++++----------------
 tests/qemu-iotests/062           |  5 ++-
 tests/qemu-iotests/063           | 18 ++++----
 tests/qemu-iotests/063.out       |  3 +-
 tests/qemu-iotests/066           |  7 +++-
 tests/qemu-iotests/067           |  6 ++-
 tests/qemu-iotests/068           |  6 ++-
 tests/qemu-iotests/069           |  2 +-
 tests/qemu-iotests/071           |  7 +++-
 tests/qemu-iotests/073           |  4 ++
 tests/qemu-iotests/074           |  4 +-
 tests/qemu-iotests/079           |  3 +-
 tests/qemu-iotests/080           |  7 ++--
 tests/qemu-iotests/081           |  6 +--
 tests/qemu-iotests/085           | 18 ++++----
 tests/qemu-iotests/085.out       |  8 ++--
 tests/qemu-iotests/088           |  2 +-
 tests/qemu-iotests/090           |  2 +
 tests/qemu-iotests/091           |  2 +-
 tests/qemu-iotests/091.out       |  2 -
 tests/qemu-iotests/092           |  2 +-
 tests/qemu-iotests/094           |  4 +-
 tests/qemu-iotests/095           |  5 ++-
 tests/qemu-iotests/098           |  6 ++-
 tests/qemu-iotests/099           | 10 +++--
 tests/qemu-iotests/103           |  5 ++-
 tests/qemu-iotests/106           |  2 +-
 tests/qemu-iotests/108           | 10 +++--
 tests/qemu-iotests/109           |  4 +-
 tests/qemu-iotests/110           | 11 +++--
 tests/qemu-iotests/110.out       |  4 +-
 tests/qemu-iotests/111           |  3 +-
 tests/qemu-iotests/112           | 37 ++++++++--------
 tests/qemu-iotests/114           |  2 +
 tests/qemu-iotests/115           |  3 +-
 tests/qemu-iotests/121           |  9 ++--
 tests/qemu-iotests/122           |  6 ++-
 tests/qemu-iotests/123           |  4 +-
 tests/qemu-iotests/125           |  2 +-
 tests/qemu-iotests/137           | 17 +++++---
 tests/qemu-iotests/137.out       |  6 +--
 tests/qemu-iotests/138           |  8 ++--
 tests/qemu-iotests/141           |  4 +-
 tests/qemu-iotests/142           |  2 +-
 tests/qemu-iotests/144           |  4 +-
 tests/qemu-iotests/153           | 12 ++----
 tests/qemu-iotests/156           | 10 ++++-
 tests/qemu-iotests/159           |  2 +-
 tests/qemu-iotests/160           |  3 +-
 tests/qemu-iotests/161           |  4 +-
 tests/qemu-iotests/170           |  2 +-
 tests/qemu-iotests/172           |  6 +--
 tests/qemu-iotests/173           |  3 +-
 tests/qemu-iotests/174           |  2 +-
 tests/qemu-iotests/175           |  2 +-
 tests/qemu-iotests/176           |  7 +++-
 tests/qemu-iotests/178           |  6 +--
 tests/qemu-iotests/182           |  2 +-
 tests/qemu-iotests/183           |  2 +-
 tests/qemu-iotests/185           |  4 +-
 tests/qemu-iotests/187           |  6 +--
 tests/qemu-iotests/190           |  4 +-
 tests/qemu-iotests/191           | 11 ++---
 tests/qemu-iotests/195           |  2 +-
 tests/qemu-iotests/197           |  6 +--
 tests/qemu-iotests/198           |  6 ++-
 tests/qemu-iotests/198.out       |  4 +-
 tests/qemu-iotests/200           |  7 ++--
 tests/qemu-iotests/201           |  6 +--
 tests/qemu-iotests/214           |  3 +-
 tests/qemu-iotests/215           |  6 +--
 tests/qemu-iotests/217           |  3 +-
 tests/qemu-iotests/220           |  5 ++-
 tests/qemu-iotests/225           |  2 +-
 tests/qemu-iotests/229           |  3 +-
 tests/qemu-iotests/232           |  4 +-
 tests/qemu-iotests/243           | 10 +++--
 tests/qemu-iotests/244           | 15 ++++---
 tests/qemu-iotests/247           |  4 +-
 tests/qemu-iotests/249           |  4 +-
 tests/qemu-iotests/250           |  5 ++-
 tests/qemu-iotests/252           |  2 +-
 tests/qemu-iotests/261           |  5 ++-
 tests/qemu-iotests/265           |  2 +-
 tests/qemu-iotests/267           | 17 +++++---
 tests/qemu-iotests/common.filter | 47 ++++++++++++++++++++-
 tests/qemu-iotests/common.rc     | 63 ++++++++++++++++++++++++----
 tests/qemu-iotests/qcow2.py      | 23 ++++++++--
 115 files changed, 614 insertions(+), 460 deletions(-)

-- 
2.23.0

On 07.11.19 17:36, Max Reitz wrote:
> Hi,
> 
> The cover letter from v1 (explaining the motivation behind this series
> and the general structure) is here:
> 
> https://lists.nongnu.org/archive/html/qemu-block/2019-09/msg01323.html
> 
> 
> For v2, I’ve addressed more of Maxim’s comments:
> - Patch 1: Added; Maxim noted this problem on patch 5, but that patch
>            doesn’t touch all files that have this mistake, so I decided
>            to make it an extra patch
> 
> - Patch 20 (now patch 21):
>   - Added TODO comments where it would make sense to at some point split
>     off some cases into an own test file (so they can run with an
>     external data file, where the whole test now has to be skipped)
>   - Fixed the reason why we have to skip 138 with external data files
>   - Disable 261, too (which was added in the meantime)
> 
> - Some contextual differences in some patches due to the $SOCK_DIR
>   series

Thanks for the reviews, fixed the typo in patch 21, disabled data_file
for 273 (which was added in the meantime), and applied the series to my
block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max

Patchew URL: https://patchew.org/QEMU/20191107163708.833192-1-mreitz@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PATCH v3 00/22] iotests: Allow ./check -o data_file
Type: series
Message-id: 20191107163708.833192-1-mreitz@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
01a2839 iotests: Allow check -o data_file
31bc07b iotests: Disable data_file where it cannot be used
98a2575 iotests: Make 198 work with data_file
e8f406f iotests: Make 137 work with data_file
46cc09d iotests: Make 110 work with data_file
1f7b2e5 iotests: Make 091 work with data_file
401d3ef iotests: Avoid cp/mv of test images
a3746a2 iotests: Use _rm_test_img for deleting test images
37a01c8 iotests: Avoid qemu-img create
a05c5ec iotests: Drop IMGOPTS use in 267
44aac70 iotests: Replace IMGOPTS='' by --no-opts
cb9ee70 iotests: Replace IMGOPTS= by -o
3c2893f iotests: Inject space into -ocompat=0.10 in 051
8b5f9d4 iotests: Add -o and --no-opts to _make_test_img
239f933 iotests: Let _make_test_img parse its parameters
405ddde iotests: Drop compat=1.1 in 050
527ae22 iotests: Replace IMGOPTS by _unsupported_imgopts
77f688d iotests: Filter refcount_order in 036
3f29d5f iotests: Add _filter_json_filename
58975a8 iotests/qcow2.py: Split feature fields into bits
7ea641e iotests/qcow2.py: Add dump-header-exts
469af5e iotests: s/qocw2/qcow2/

=== OUTPUT BEGIN ===
1/22 Checking commit 469af5ede216 (iotests: s/qocw2/qcow2/)
2/22 Checking commit 7ea641ec6b0a (iotests/qcow2.py: Add dump-header-exts)
ERROR: line over 90 characters
#33: FILE: tests/qemu-iotests/qcow2.py:237:
+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],

total: 1 errors, 0 warnings, 17 lines checked

Patch 2/22 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

3/22 Checking commit 58975a850885 (iotests/qcow2.py: Split feature fields into bits)
4/22 Checking commit 3f29d5f2c82a (iotests: Add _filter_json_filename)
5/22 Checking commit 77f688d94ac8 (iotests: Filter refcount_order in 036)
6/22 Checking commit 527ae221d7bc (iotests: Replace IMGOPTS by _unsupported_imgopts)
7/22 Checking commit 405dddedf22d (iotests: Drop compat=1.1 in 050)
8/22 Checking commit 239f933e104c (iotests: Let _make_test_img parse its parameters)
9/22 Checking commit 8b5f9d4a9fff (iotests: Add -o and --no-opts to _make_test_img)
10/22 Checking commit 3c2893f30375 (iotests: Inject space into -ocompat=0.10 in 051)
11/22 Checking commit cb9ee70ce491 (iotests: Replace IMGOPTS= by -o)
12/22 Checking commit 44aac701db74 (iotests: Replace IMGOPTS='' by --no-opts)
13/22 Checking commit a05c5ec14fb2 (iotests: Drop IMGOPTS use in 267)
14/22 Checking commit 37a01c83e4e6 (iotests: Avoid qemu-img create)
15/22 Checking commit a3746a2198bc (iotests: Use _rm_test_img for deleting test images)
16/22 Checking commit 401d3ef85556 (iotests: Avoid cp/mv of test images)
17/22 Checking commit 1f7b2e52555b (iotests: Make 091 work with data_file)
18/22 Checking commit 46cc09d0608f (iotests: Make 110 work with data_file)
19/22 Checking commit e8f406f2bda8 (iotests: Make 137 work with data_file)
20/22 Checking commit 98a25755fe17 (iotests: Make 198 work with data_file)
21/22 Checking commit 31bc07b55b8a (iotests: Disable data_file where it cannot be used)
22/22 Checking commit 01a283955091 (iotests: Allow check -o data_file)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20191107163708.833192-1-mreitz@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

On 07.11.19 22:10, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20191107163708.833192-1-mreitz@redhat.com/
> 
> 
> 
> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Subject: [PATCH v3 00/22] iotests: Allow ./check -o data_file
> Type: series
> Message-id: 20191107163708.833192-1-mreitz@redhat.com
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
> 
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> Switched to a new branch 'test'
> 01a2839 iotests: Allow check -o data_file
> 31bc07b iotests: Disable data_file where it cannot be used
> 98a2575 iotests: Make 198 work with data_file
> e8f406f iotests: Make 137 work with data_file
> 46cc09d iotests: Make 110 work with data_file
> 1f7b2e5 iotests: Make 091 work with data_file
> 401d3ef iotests: Avoid cp/mv of test images
> a3746a2 iotests: Use _rm_test_img for deleting test images
> 37a01c8 iotests: Avoid qemu-img create
> a05c5ec iotests: Drop IMGOPTS use in 267
> 44aac70 iotests: Replace IMGOPTS='' by --no-opts
> cb9ee70 iotests: Replace IMGOPTS= by -o
> 3c2893f iotests: Inject space into -ocompat=0.10 in 051
> 8b5f9d4 iotests: Add -o and --no-opts to _make_test_img
> 239f933 iotests: Let _make_test_img parse its parameters
> 405ddde iotests: Drop compat=1.1 in 050
> 527ae22 iotests: Replace IMGOPTS by _unsupported_imgopts
> 77f688d iotests: Filter refcount_order in 036
> 3f29d5f iotests: Add _filter_json_filename
> 58975a8 iotests/qcow2.py: Split feature fields into bits
> 7ea641e iotests/qcow2.py: Add dump-header-exts
> 469af5e iotests: s/qocw2/qcow2/
> 
> === OUTPUT BEGIN ===
> 1/22 Checking commit 469af5ede216 (iotests: s/qocw2/qcow2/)
> 2/22 Checking commit 7ea641ec6b0a (iotests/qcow2.py: Add dump-header-exts)
> ERROR: line over 90 characters
> #33: FILE: tests/qemu-iotests/qcow2.py:237:
> +    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],

As in v1, I deliberately followed the existing style in this file and
believe it’s for the best.

Max