| From a510cccdd420d33dc4c12eb5f638521f8d951e22 Mon Sep 17 00:00:00 2001 |
| From: Kevin Wolf <kwolf@redhat.com> |
| Date: Tue, 25 Mar 2014 14:23:16 +0100 |
| Subject: [PATCH 09/49] qemu-iotests: Support for bochs format |
| |
| RH-Author: Kevin Wolf <kwolf@redhat.com> |
| Message-id: <1395753835-7591-10-git-send-email-kwolf@redhat.com> |
| Patchwork-id: n/a |
| O-Subject: [virt-devel] [EMBARGOED RHEL-7.0 qemu-kvm PATCH 09/48] qemu-iotests: Support for bochs format |
| Bugzilla: 1066691 |
| RH-Acked-by: Jeff Cody <jcody@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| |
| Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1066691 |
| Upstream status: Series embargoed |
| |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> |
| |
| Conflicts: |
| tests/qemu-iotests/group |
| |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| |
| tests/qemu-iotests/078 | 53 ++++++++++++++++++++++ |
| tests/qemu-iotests/078.out | 6 +++ |
| tests/qemu-iotests/common | 7 +++ |
| tests/qemu-iotests/group | 1 + |
| tests/qemu-iotests/sample_images/empty.bochs.bz2 | Bin 0 -> 118 bytes |
| 5 files changed, 67 insertions(+), 0 deletions(-) |
| create mode 100755 tests/qemu-iotests/078 |
| create mode 100644 tests/qemu-iotests/078.out |
| create mode 100644 tests/qemu-iotests/sample_images/empty.bochs.bz2 |
| |
| diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 |
| new file mode 100755 |
| index 0000000..f55f46d |
| |
| |
| @@ -0,0 +1,53 @@ |
| +#!/bin/bash |
| +# |
| +# bochs format input validation tests |
| +# |
| +# Copyright (C) 2013 Red Hat, Inc. |
| +# |
| +# This program is free software; you can redistribute it and/or modify |
| +# it under the terms of the GNU General Public License as published by |
| +# the Free Software Foundation; either version 2 of the License, or |
| +# (at your option) any later version. |
| +# |
| +# This program is distributed in the hope that it will be useful, |
| +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| +# GNU General Public License for more details. |
| +# |
| +# You should have received a copy of the GNU General Public License |
| +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| +# |
| + |
| +# creator |
| +owner=kwolf@redhat.com |
| + |
| +seq=`basename $0` |
| +echo "QA output created by $seq" |
| + |
| +here=`pwd` |
| +tmp=/tmp/$$ |
| +status=1 # failure is the default! |
| + |
| +_cleanup() |
| +{ |
| + _cleanup_test_img |
| +} |
| +trap "_cleanup; exit \$status" 0 1 2 3 15 |
| + |
| +# get standard environment, filters and checks |
| +. ./common.rc |
| +. ./common.filter |
| + |
| +_supported_fmt bochs |
| +_supported_proto generic |
| +_supported_os Linux |
| + |
| +echo |
| +echo "== Read from a valid image ==" |
| +_use_sample_img empty.bochs.bz2 |
| +{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir |
| + |
| +# success, all done |
| +echo "*** done" |
| +rm -f $seq.full |
| +status=0 |
| diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out |
| new file mode 100644 |
| index 0000000..25d37c5 |
| |
| |
| @@ -0,0 +1,6 @@ |
| +QA output created by 078 |
| + |
| +== Read from a valid image == |
| +read 512/512 bytes at offset 0 |
| +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) |
| +*** done |
| diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common |
| index b5043fc..35abbfc 100644 |
| |
| |
| @@ -128,6 +128,7 @@ common options |
| |
| check options |
| -raw test raw (default) |
| + -bochs test bochs |
| -cow test cow |
| -cloop test cloop |
| -qcow test qcow |
| @@ -163,6 +164,12 @@ testlist options |
| xpand=false |
| ;; |
| |
| + -bochs) |
| + IMGFMT=bochs |
| + IMGFMT_GENERIC=false |
| + xpand=false |
| + ;; |
| + |
| -cow) |
| IMGFMT=cow |
| xpand=false |
| diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group |
| index 427818c..30a0fd8 100644 |
| |
| |
| @@ -73,6 +73,7 @@ |
| 070 rw auto |
| 075 rw auto |
| 077 rw auto |
| +078 rw auto |
| 079 rw auto |
| 082 rw auto quick |
| 086 rw auto quick |
| -- |
| 1.7.1 |
| |