iotests: Skip test for ENOMEM error

[Qemu-devel] [PATCH] iotests: Skip test for ENOMEM error

Posted by Fam Zheng 7 years, 7 months ago

The AFL image is to exercise the code validating image size, which
doesn't work on 32 bit or when out of memory (there is a large
allocation before the interesting point). So check that and skip the
test, instead of faking the result.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/059 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index 40f89eae18..530bbbe6ce 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -152,9 +152,8 @@ done
 echo
 echo "=== Testing afl image with a very large capacity ==="
 _use_sample_img afl9.vmdk.bz2
-# The sed makes this test pass on machines with little RAM
-# (and also with 32 bit builds)
-_img_info | sed -e 's/Cannot allocate memory/Invalid argument/'
+_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficent memory, skipped test"
+_img_info
 _cleanup_test_img
 
 # success, all done
-- 
2.14.3

Re: [Qemu-devel] [PATCH] iotests: Skip test for ENOMEM error

Posted by Eric Blake 7 years, 7 months ago

On 02/28/2018 07:14 PM, Fam Zheng wrote:
> The AFL image is to exercise the code validating image size, which
> doesn't work on 32 bit or when out of memory (there is a large
> allocation before the interesting point). So check that and skip the
> test, instead of faking the result.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>   tests/qemu-iotests/059 | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index 40f89eae18..530bbbe6ce 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -152,9 +152,8 @@ done
>   echo
>   echo "=== Testing afl image with a very large capacity ==="
>   _use_sample_img afl9.vmdk.bz2
> -# The sed makes this test pass on machines with little RAM
> -# (and also with 32 bit builds)
> -_img_info | sed -e 's/Cannot allocate memory/Invalid argument/'
> +_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficent memory, skipped test"
> +_img_info
>   _cleanup_test_img
>   
>   # success, all done
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH] iotests: Skip test for ENOMEM error

Posted by Max Reitz 7 years, 7 months ago

On 2018-03-01 02:14, Fam Zheng wrote:
> The AFL image is to exercise the code validating image size, which
> doesn't work on 32 bit or when out of memory (there is a large
> allocation before the interesting point). So check that and skip the
> test, instead of faking the result.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/059 | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Thanks!  Applied to my block branch:

https://github.com/XanClic/qemu/commits/block

Max