diff mbox series

[09/18] iotests: Drop IMGOPTS use in 267

Message ID 20190927094242.11152-10-mreitz@redhat.com (mailing list archive)
State New, archived
Headers show
Series iotests: Allow ./check -o data_file | expand

Commit Message

Max Reitz Sept. 27, 2019, 9:42 a.m. UTC 
Overwriting IMGOPTS means ignoring all user-supplied options, which is
not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
variable.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/267 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Maxim Levitsky Sept. 29, 2019, 4:33 p.m. UTC | #1 
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Overwriting IMGOPTS means ignoring all user-supplied options, which is
> not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
> variable.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/267 | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
> index 95f885442f..529f5f9afe 100755
> --- a/tests/qemu-iotests/267
> +++ b/tests/qemu-iotests/267
> @@ -68,7 +68,11 @@ size=128M
>  
>  run_test()
>  {
> -    _make_test_img $size
> +    if [ -n "$BACKING_FILE" ]; then
> +        _make_test_img -b "$BACKING_FILE" $size
> +    else
> +        _make_test_img $size
> +    fi
>      printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
>  }
>  
> @@ -119,12 +123,12 @@ echo
>  
>  TEST_IMG="$TEST_IMG.base" _make_test_img $size
>  
> -IMGOPTS="backing_file=$TEST_IMG.base" \
> +BACKING_FILE="$TEST_IMG.base" \
>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
>           -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
>  
> -IMGOPTS="backing_file=$TEST_IMG.base" \
> +BACKING_FILE="$TEST_IMG.base" \
>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>           -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> @@ -141,7 +145,7 @@ echo
>  echo "=== -blockdev with NBD server on the backing file ==="
>  echo
>  
> -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
> +_make_test_img -b "$TEST_IMG.base" $size
>  cat <<EOF |
>  nbd_server_start unix:$TEST_DIR/nbd
>  nbd_server_add -w backing-fmt

qemu's master (pulled today), don't have iotest 267,
you probably based this on some not yet merged branch.
Or I made some mistake with pulling the master branch.

Best regards,
	Maxim Levitsky
Max Reitz Sept. 30, 2019, 1:01 p.m. UTC | #2 
On 29.09.19 18:33, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> Overwriting IMGOPTS means ignoring all user-supplied options, which is
>> not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
>> variable.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>  tests/qemu-iotests/267 | 12 ++++++++----
>>  1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
>> index 95f885442f..529f5f9afe 100755
>> --- a/tests/qemu-iotests/267
>> +++ b/tests/qemu-iotests/267
>> @@ -68,7 +68,11 @@ size=128M
>>  
>>  run_test()
>>  {
>> -    _make_test_img $size
>> +    if [ -n "$BACKING_FILE" ]; then
>> +        _make_test_img -b "$BACKING_FILE" $size
>> +    else
>> +        _make_test_img $size
>> +    fi
>>      printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
>>  }
>>  
>> @@ -119,12 +123,12 @@ echo
>>  
>>  TEST_IMG="$TEST_IMG.base" _make_test_img $size
>>  
>> -IMGOPTS="backing_file=$TEST_IMG.base" \
>> +BACKING_FILE="$TEST_IMG.base" \
>>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
>>           -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
>>  
>> -IMGOPTS="backing_file=$TEST_IMG.base" \
>> +BACKING_FILE="$TEST_IMG.base" \
>>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>>           -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
>>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
>> @@ -141,7 +145,7 @@ echo
>>  echo "=== -blockdev with NBD server on the backing file ==="
>>  echo
>>  
>> -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
>> +_make_test_img -b "$TEST_IMG.base" $size
>>  cat <<EOF |
>>  nbd_server_start unix:$TEST_DIR/nbd
>>  nbd_server_add -w backing-fmt
> 
> qemu's master (pulled today), don't have iotest 267,
> you probably based this on some not yet merged branch.
> Or I made some mistake with pulling the master branch.

Yep, it’s only in Kevin’s block branch (and thus mine, too).  He sent a
pull request for it, which was rejected though (because this test is
broken on anything but x64, but that doesn’t stop this patch).

Max
Maxim Levitsky Sept. 30, 2019, 2:32 p.m. UTC | #3 
On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
> On 29.09.19 18:33, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > Overwriting IMGOPTS means ignoring all user-supplied options, which is
> > > not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
> > > variable.
> > > 
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > >  tests/qemu-iotests/267 | 12 ++++++++----
> > >  1 file changed, 8 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
> > > index 95f885442f..529f5f9afe 100755
> > > --- a/tests/qemu-iotests/267
> > > +++ b/tests/qemu-iotests/267
> > > @@ -68,7 +68,11 @@ size=128M
> > >  
> > >  run_test()
> > >  {
> > > -    _make_test_img $size
> > > +    if [ -n "$BACKING_FILE" ]; then
> > > +        _make_test_img -b "$BACKING_FILE" $size
> > > +    else
> > > +        _make_test_img $size
> > > +    fi
> > >      printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
> > >  }
> > >  
> > > @@ -119,12 +123,12 @@ echo
> > >  
> > >  TEST_IMG="$TEST_IMG.base" _make_test_img $size
> > >  
> > > -IMGOPTS="backing_file=$TEST_IMG.base" \
> > > +BACKING_FILE="$TEST_IMG.base" \
> > >  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> > >           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> > >           -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
> > >  
> > > -IMGOPTS="backing_file=$TEST_IMG.base" \
> > > +BACKING_FILE="$TEST_IMG.base" \
> > >  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> > >           -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
> > >           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> > > @@ -141,7 +145,7 @@ echo
> > >  echo "=== -blockdev with NBD server on the backing file ==="
> > >  echo
> > >  
> > > -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
> > > +_make_test_img -b "$TEST_IMG.base" $size
> > >  cat <<EOF |
> > >  nbd_server_start unix:$TEST_DIR/nbd
> > >  nbd_server_add -w backing-fmt
> > 
> > qemu's master (pulled today), don't have iotest 267,
> > you probably based this on some not yet merged branch.
> > Or I made some mistake with pulling the master branch.
> 
> Yep, it’s only in Kevin’s block branch (and thus mine, too).  He sent a
> pull request for it, which was rejected though (because this test is
> broken on anything but x64, but that doesn’t stop this patch).
> 

I figured out that it must be something like that.
Being lazy, I would like to ask if we have maybe a list of these 
branches somewhere in the wiki?

Best regards,
	Maxim Levitsky
Max Reitz Sept. 30, 2019, 3:01 p.m. UTC | #4 
On 30.09.19 16:32, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
>> On 29.09.19 18:33, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>> Overwriting IMGOPTS means ignoring all user-supplied options, which is
>>>> not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
>>>> variable.
>>>>
>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>> ---
>>>>  tests/qemu-iotests/267 | 12 ++++++++----
>>>>  1 file changed, 8 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
>>>> index 95f885442f..529f5f9afe 100755
>>>> --- a/tests/qemu-iotests/267
>>>> +++ b/tests/qemu-iotests/267
>>>> @@ -68,7 +68,11 @@ size=128M
>>>>  
>>>>  run_test()
>>>>  {
>>>> -    _make_test_img $size
>>>> +    if [ -n "$BACKING_FILE" ]; then
>>>> +        _make_test_img -b "$BACKING_FILE" $size
>>>> +    else
>>>> +        _make_test_img $size
>>>> +    fi
>>>>      printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
>>>>  }
>>>>  
>>>> @@ -119,12 +123,12 @@ echo
>>>>  
>>>>  TEST_IMG="$TEST_IMG.base" _make_test_img $size
>>>>  
>>>> -IMGOPTS="backing_file=$TEST_IMG.base" \
>>>> +BACKING_FILE="$TEST_IMG.base" \
>>>>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>>>>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
>>>>           -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
>>>>  
>>>> -IMGOPTS="backing_file=$TEST_IMG.base" \
>>>> +BACKING_FILE="$TEST_IMG.base" \
>>>>  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
>>>>           -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
>>>>           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
>>>> @@ -141,7 +145,7 @@ echo
>>>>  echo "=== -blockdev with NBD server on the backing file ==="
>>>>  echo
>>>>  
>>>> -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
>>>> +_make_test_img -b "$TEST_IMG.base" $size
>>>>  cat <<EOF |
>>>>  nbd_server_start unix:$TEST_DIR/nbd
>>>>  nbd_server_add -w backing-fmt
>>>
>>> qemu's master (pulled today), don't have iotest 267,
>>> you probably based this on some not yet merged branch.
>>> Or I made some mistake with pulling the master branch.
>>
>> Yep, it’s only in Kevin’s block branch (and thus mine, too).  He sent a
>> pull request for it, which was rejected though (because this test is
>> broken on anything but x64, but that doesn’t stop this patch).
>>
> 
> I figured out that it must be something like that.
> Being lazy, I would like to ask if we have maybe a list of these 
> branches somewhere in the wiki?

The MAINTAINERS file has at least Kevin’s branch:

$ scripts/get_maintainer.pl --scm --no-email --no-l -f block
git https://repo.or.cz/qemu/kevin.git block

Max
Maxim Levitsky Sept. 30, 2019, 3:06 p.m. UTC | #5 
On Mon, 2019-09-30 at 17:01 +0200, Max Reitz wrote:
> On 30.09.19 16:32, Maxim Levitsky wrote:
> > On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
> > > On 29.09.19 18:33, Maxim Levitsky wrote:
> > > > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > > > Overwriting IMGOPTS means ignoring all user-supplied options, which is
> > > > > not what we want.  Replace the current IMGOPTS use by a new BACKING_FILE
> > > > > variable.
> > > > > 
> > > > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > > > ---
> > > > >  tests/qemu-iotests/267 | 12 ++++++++----
> > > > >  1 file changed, 8 insertions(+), 4 deletions(-)
> > > > > 
> > > > > diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
> > > > > index 95f885442f..529f5f9afe 100755
> > > > > --- a/tests/qemu-iotests/267
> > > > > +++ b/tests/qemu-iotests/267
> > > > > @@ -68,7 +68,11 @@ size=128M
> > > > >  
> > > > >  run_test()
> > > > >  {
> > > > > -    _make_test_img $size
> > > > > +    if [ -n "$BACKING_FILE" ]; then
> > > > > +        _make_test_img -b "$BACKING_FILE" $size
> > > > > +    else
> > > > > +        _make_test_img $size
> > > > > +    fi
> > > > >      printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
> > > > >  }
> > > > >  
> > > > > @@ -119,12 +123,12 @@ echo
> > > > >  
> > > > >  TEST_IMG="$TEST_IMG.base" _make_test_img $size
> > > > >  
> > > > > -IMGOPTS="backing_file=$TEST_IMG.base" \
> > > > > +BACKING_FILE="$TEST_IMG.base" \
> > > > >  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> > > > >           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> > > > >           -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
> > > > >  
> > > > > -IMGOPTS="backing_file=$TEST_IMG.base" \
> > > > > +BACKING_FILE="$TEST_IMG.base" \
> > > > >  run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
> > > > >           -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
> > > > >           -blockdev driver=file,filename="$TEST_IMG",node-name=file \
> > > > > @@ -141,7 +145,7 @@ echo
> > > > >  echo "=== -blockdev with NBD server on the backing file ==="
> > > > >  echo
> > > > >  
> > > > > -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
> > > > > +_make_test_img -b "$TEST_IMG.base" $size
> > > > >  cat <<EOF |
> > > > >  nbd_server_start unix:$TEST_DIR/nbd
> > > > >  nbd_server_add -w backing-fmt
> > > > 
> > > > qemu's master (pulled today), don't have iotest 267,
> > > > you probably based this on some not yet merged branch.
> > > > Or I made some mistake with pulling the master branch.
> > > 
> > > Yep, it’s only in Kevin’s block branch (and thus mine, too).  He sent a
> > > pull request for it, which was rejected though (because this test is
> > > broken on anything but x64, but that doesn’t stop this patch).
> > > 
> > 
> > I figured out that it must be something like that.
> > Being lazy, I would like to ask if we have maybe a list of these 
> > branches somewhere in the wiki?
> 
> The MAINTAINERS file has at least Kevin’s branch:
> 
> $ scripts/get_maintainer.pl --scm --no-email --no-l -f block
> git https://repo.or.cz/qemu/kevin.git block
Thank you!
I didn't knew that MAINTAINERS contain git branches these day.

Best regards,
	Maxim Levitsky
diff mbox series

Patch

diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index 95f885442f..529f5f9afe 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -68,7 +68,11 @@  size=128M
 
 run_test()
 {
-    _make_test_img $size
+    if [ -n "$BACKING_FILE" ]; then
+        _make_test_img -b "$BACKING_FILE" $size
+    else
+        _make_test_img $size
+    fi
     printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
 }
 
@@ -119,12 +123,12 @@  echo
 
 TEST_IMG="$TEST_IMG.base" _make_test_img $size
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
          -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
 
-IMGOPTS="backing_file=$TEST_IMG.base" \
+BACKING_FILE="$TEST_IMG.base" \
 run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
          -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
          -blockdev driver=file,filename="$TEST_IMG",node-name=file \
@@ -141,7 +145,7 @@  echo
 echo "=== -blockdev with NBD server on the backing file ==="
 echo
 
-IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
+_make_test_img -b "$TEST_IMG.base" $size
 cat <<EOF |
 nbd_server_start unix:$TEST_DIR/nbd
 nbd_server_add -w backing-fmt