| Message ID | 20180301011413.11531-1-famz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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
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
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(-)