Re: [PATCH 10/10] tests/qemu-iotests/check: Update to match Python 3 interpreter

[Philippe Mathieu-Daudé]

On 1/30/20 11:58 AM, Kevin Wolf wrote:
> Am 30.01.2020 um 00:14 hat Philippe Mathieu-Daudé geschrieben:
> > All the iotests Python scripts have been converted to search for
> > the Python 3 interpreter. Update the ./check script accordingly.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>
> > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> > index 2890785a10..2e7d29d570 100755
> > --- a/tests/qemu-iotests/check
> > +++ b/tests/qemu-iotests/check
> > @@ -825,7 +825,7 @@ do
> >   
> >           start=$(_wallclock)
> >   
> > -        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
> > +        if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python3" 
> > ]; then
> >               if $python_usable; then
> >                   run_command="$PYTHON $seq"
> >               else
>
> Changing some test cases in patch 2 and only updating ./check now breaks
> bisectability.
>
> I'm not sure why you separated patch 2 and 8. I think the easiest way
> would be to change all qemu-iotests cases in the same patch and also
> update ./check in that patch.

Tests in patch 2 use: if __name__ == "__main__", while tests in patch 8 
don't. If I add the check I have to re-indent the patches, some lines 
don't fit the 80char limit and require manual fixup... This doesn't look 
worthwhile.

> Otherwise, you'd have to change ./check in patch 2 to accept both
> versions and could possibly remove the "python" version again here.

OK.