| Message ID | 20190715145438.6880-2-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Enable iotests during "make check" | expand |
On 7/15/19 9:54 AM, Thomas Huth wrote: > Remove some more tests from the "auto" group that either have issues > in certain environments (like macOS or FreeBSD, or on certain file systems > like ZFS or tmpfs), do not work with the qcow2 format, or that are simply > taking too much time. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- > 1 file changed, 55 insertions(+), 54 deletions(-) > 251 rw auto quick > 252 rw auto backing quick > -253 rw auto quick > -254 rw auto backing quick > -255 rw auto quick > -256 rw auto quick > +253 rw o_direct quick Where is the new 'o_direct' group documented? Is this a typo for something else? > +254 rw backing quick > +255 rw quick > +256 rw quick >
On 15/07/2019 17.12, Eric Blake wrote: > On 7/15/19 9:54 AM, Thomas Huth wrote: >> Remove some more tests from the "auto" group that either have issues >> in certain environments (like macOS or FreeBSD, or on certain file systems >> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply >> taking too much time. >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- >> 1 file changed, 55 insertions(+), 54 deletions(-) > >> 251 rw auto quick >> 252 rw auto backing quick >> -253 rw auto quick >> -254 rw auto backing quick >> -255 rw auto quick >> -256 rw auto quick >> +253 rw o_direct quick > > Where is the new 'o_direct' group documented? Is this a typo for > something else? I needed a new group for test 142 since it would be without any group at all otherwise: -142 auto +142 o_direct Tests without a group are currently only possible if the line ends with a space - which is quite error prone. So I think it's better to use a new group here. Since 253 is about testing with O_DIRECT, too, I've put it into this group, too. Sorry, I should have mentioned it in the patch description. Thomas
On 15.07.19 17:18, Thomas Huth wrote: > On 15/07/2019 17.12, Eric Blake wrote: >> On 7/15/19 9:54 AM, Thomas Huth wrote: >>> Remove some more tests from the "auto" group that either have issues >>> in certain environments (like macOS or FreeBSD, or on certain file systems >>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply >>> taking too much time. >>> >>> Signed-off-by: Thomas Huth <thuth@redhat.com> >>> --- >>> tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- >>> 1 file changed, 55 insertions(+), 54 deletions(-) >> >>> 251 rw auto quick >>> 252 rw auto backing quick >>> -253 rw auto quick >>> -254 rw auto backing quick >>> -255 rw auto quick >>> -256 rw auto quick >>> +253 rw o_direct quick >> >> Where is the new 'o_direct' group documented? Is this a typo for >> something else? > > I needed a new group for test 142 since it would be without any group at > all otherwise: > > -142 auto > +142 o_direct > > Tests without a group are currently only possible if the line ends with > a space - which is quite error prone. Why not just fix that, then? > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index f925606cc5..c24874ff4a 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -488,7 +488,7 @@ testlist options > BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ > | while read id > do > - if grep -s "^$id " "$source_iotests/group" >/dev/null > + if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null > then > # in group file ... OK > echo $id >>$tmp.list > @@ -547,7 +547,7 @@ else > touch $tmp.list > else > # no test numbers, do everything from group file > - sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list > + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list > fi > fi > looks to be enough for me. Max > So I think it's better to use a > new group here. Since 253 is about testing with O_DIRECT, too, I've put > it into this group, too. Sorry, I should have mentioned it in the patch > description. > > Thomas >
On 15/07/2019 19.17, Max Reitz wrote: > On 15.07.19 17:18, Thomas Huth wrote: >> On 15/07/2019 17.12, Eric Blake wrote: >>> On 7/15/19 9:54 AM, Thomas Huth wrote: >>>> Remove some more tests from the "auto" group that either have issues >>>> in certain environments (like macOS or FreeBSD, or on certain file systems >>>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply >>>> taking too much time. >>>> >>>> Signed-off-by: Thomas Huth <thuth@redhat.com> >>>> --- >>>> tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- >>>> 1 file changed, 55 insertions(+), 54 deletions(-) >>> >>>> 251 rw auto quick >>>> 252 rw auto backing quick >>>> -253 rw auto quick >>>> -254 rw auto backing quick >>>> -255 rw auto quick >>>> -256 rw auto quick >>>> +253 rw o_direct quick >>> >>> Where is the new 'o_direct' group documented? Is this a typo for >>> something else? >> >> I needed a new group for test 142 since it would be without any group at >> all otherwise: >> >> -142 auto >> +142 o_direct >> >> Tests without a group are currently only possible if the line ends with >> a space - which is quite error prone. > > Why not just fix that, then? That's of course the even better solution :-) >> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check >> index f925606cc5..c24874ff4a 100755 >> --- a/tests/qemu-iotests/check >> +++ b/tests/qemu-iotests/check >> @@ -488,7 +488,7 @@ testlist options >> BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ >> | while read id >> do >> - if grep -s "^$id " "$source_iotests/group" >/dev/null >> + if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null >> then >> # in group file ... OK >> echo $id >>$tmp.list >> @@ -547,7 +547,7 @@ else >> touch $tmp.list >> else >> # no test numbers, do everything from group file >> - sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list That old "[ ]" looks quite strange anyway! I guess there was a TAB in here originally which got replaced by spaces at one point in time? >> + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list >> fi >> fi >> > > looks to be enough for me. Seems to work, thanks! I'll respin my series with your patch included. Thomas
On 16.07.19 11:03, Thomas Huth wrote: > On 15/07/2019 19.17, Max Reitz wrote: >> On 15.07.19 17:18, Thomas Huth wrote: >>> On 15/07/2019 17.12, Eric Blake wrote: >>>> On 7/15/19 9:54 AM, Thomas Huth wrote: >>>>> Remove some more tests from the "auto" group that either have issues >>>>> in certain environments (like macOS or FreeBSD, or on certain file systems >>>>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply >>>>> taking too much time. >>>>> >>>>> Signed-off-by: Thomas Huth <thuth@redhat.com> >>>>> --- >>>>> tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- >>>>> 1 file changed, 55 insertions(+), 54 deletions(-) >>>> >>>>> 251 rw auto quick >>>>> 252 rw auto backing quick >>>>> -253 rw auto quick >>>>> -254 rw auto backing quick >>>>> -255 rw auto quick >>>>> -256 rw auto quick >>>>> +253 rw o_direct quick >>>> >>>> Where is the new 'o_direct' group documented? Is this a typo for >>>> something else? >>> >>> I needed a new group for test 142 since it would be without any group at >>> all otherwise: >>> >>> -142 auto >>> +142 o_direct >>> >>> Tests without a group are currently only possible if the line ends with >>> a space - which is quite error prone. >> >> Why not just fix that, then? > > That's of course the even better solution :-) > >>> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check >>> index f925606cc5..c24874ff4a 100755 >>> --- a/tests/qemu-iotests/check >>> +++ b/tests/qemu-iotests/check >>> @@ -488,7 +488,7 @@ testlist options >>> BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ >>> | while read id >>> do >>> - if grep -s "^$id " "$source_iotests/group" >/dev/null >>> + if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null >>> then >>> # in group file ... OK >>> echo $id >>$tmp.list >>> @@ -547,7 +547,7 @@ else >>> touch $tmp.list >>> else >>> # no test numbers, do everything from group file >>> - sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list > > That old "[ ]" looks quite strange anyway! I guess there was a TAB > in here originally which got replaced by spaces at one point in time? That’s what I think, too. >>> + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list >>> fi >>> fi >>> >> >> looks to be enough for me. > > Seems to work, thanks! I'll respin my series with your patch included. Great :-) Max
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index b34c8e3c0c..9db19f7bed 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -14,7 +14,8 @@ # runnable in any case. That means they should run with every QEMU binary # (also non-x86), with every QEMU configuration (i.e. must not fail if # an optional feature is not compiled in - but reporting a "skip" is ok), -# and work all kind of host filesystems and users (e.g. "nobody" or "root"). +# work at least with the qcow2 file format and work all kind of host +# filesystems and users (e.g. "nobody" or "root"). # # @@ -33,8 +34,8 @@ 011 rw auto quick 012 auto quick 013 rw auto -014 rw auto -015 rw snapshot auto +014 rw +015 rw snapshot # 016 was removed, do not reuse 017 rw backing auto quick 018 rw backing auto quick @@ -42,7 +43,7 @@ 020 rw backing auto quick 021 io auto quick 022 rw snapshot auto -023 rw auto +023 rw 024 rw backing auto quick 025 rw auto quick 026 rw blkdbg @@ -78,94 +79,94 @@ 056 rw backing 057 rw 058 rw quick -059 rw auto quick +059 rw quick 060 rw auto quick 061 rw auto 062 rw auto quick 063 rw auto quick -064 rw auto quick +064 rw quick 065 rw quick 066 rw auto quick 067 rw quick 068 rw quick 069 rw auto quick -070 rw auto quick +070 rw quick 071 rw auto quick 072 rw auto quick 073 rw auto quick 074 rw auto quick -075 rw auto quick -076 auto -077 rw auto quick -078 rw auto quick +075 rw quick +076 io +077 rw quick +078 rw quick 079 rw auto 080 rw auto -081 rw auto quick -082 rw auto quick -083 rw auto -084 img auto quick +081 rw quick +082 rw quick +083 rw +084 img quick 085 rw 086 rw auto quick 087 rw quick -088 rw auto quick +088 rw quick 089 rw auto quick 090 rw auto quick -091 rw auto migration -092 rw auto quick +091 rw migration +092 rw quick 093 throttle -094 rw auto quick +094 rw quick 095 rw quick 096 rw quick 097 rw auto backing 098 rw auto backing quick 099 rw auto quick # 100 was removed, do not reuse -101 rw auto quick -102 rw auto quick +101 rw quick +102 rw quick 103 rw auto quick 104 rw auto 105 rw auto quick -106 rw auto quick +106 rw quick 107 rw auto quick 108 rw auto quick -109 rw auto +109 rw 110 rw auto backing quick 111 rw auto quick 112 rw -113 rw auto quick +113 rw quick 114 rw auto quick 115 rw -116 rw auto quick +116 rw quick 117 rw auto 118 rw -119 rw auto quick +119 rw quick 120 rw auto quick 121 rw 122 rw auto -123 rw auto quick +123 rw quick 124 rw backing 125 rw 126 rw auto backing 127 rw backing quick -128 rw auto quick +128 rw quick 129 rw quick 130 rw auto quick -131 rw auto quick +131 rw quick 132 rw quick 133 auto quick 134 rw auto quick -135 rw auto +135 rw 136 rw 137 rw auto 138 rw auto quick 139 rw quick 140 rw auto quick 141 rw auto quick -142 auto +142 o_direct 143 auto quick 144 rw quick 145 quick -146 auto quick +146 quick 147 img 148 rw quick 149 rw sudo @@ -179,18 +180,18 @@ 157 quick 158 rw auto quick 159 rw auto quick -160 rw auto quick +160 rw quick 161 rw auto quick 162 quick 163 rw 165 rw quick 169 rw quick migration 170 rw auto quick -171 rw auto quick +171 rw quick 172 auto -173 rw auto +173 rw 174 auto -175 auto quick +175 quick 176 rw auto backing 177 rw auto quick 178 img @@ -220,13 +221,13 @@ 204 rw quick 205 rw quick 206 rw -207 rw auto +207 rw 208 rw quick 209 rw quick -210 rw auto -211 rw auto quick -212 rw auto quick -213 rw auto quick +210 rw +211 rw quick +212 rw quick +213 rw quick 214 rw auto 215 rw auto quick 216 rw quick @@ -234,38 +235,38 @@ 218 rw quick 219 rw 220 rw auto -221 rw auto quick +221 rw quick 222 rw quick 223 rw quick 224 rw quick -225 rw auto quick +225 rw quick 226 auto quick 227 quick 228 rw quick 229 auto quick -231 auto quick +231 quick 232 quick -233 auto quick +233 quick 234 quick migration 235 quick 236 quick -237 rw auto quick +237 rw quick 238 quick -239 rw auto quick +239 rw quick 240 quick -241 rw auto quick +241 rw quick 242 rw quick -243 rw auto quick +243 rw quick 244 rw auto quick 245 rw 246 rw quick 247 rw quick 248 rw quick 249 rw auto quick -250 rw auto quick +250 rw quick 251 rw auto quick 252 rw auto backing quick -253 rw auto quick -254 rw auto backing quick -255 rw auto quick -256 rw auto quick +253 rw o_direct quick +254 rw backing quick +255 rw quick +256 rw quick
Remove some more tests from the "auto" group that either have issues in certain environments (like macOS or FreeBSD, or on certain file systems like ZFS or tmpfs), do not work with the qcow2 format, or that are simply taking too much time. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/qemu-iotests/group | 109 ++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 54 deletions(-)