Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Thomas Huth]

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 <address@hidden>
>>>> ---
>>>>  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

signature.asc
Description: OpenPGP digital signature