On 09/12/2017 09:44 AM, Paolo Bonzini wrote: > Split "check" parts from tests part. > > For the directory setup, the actual computation of directories goes > in "check", while the sanity checks go in the tests. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > tests/qemu-iotests/common | 24 ++++++++++++++++++++ > tests/qemu-iotests/common.config | 49 > ---------------------------------------- > tests/qemu-iotests/common.qemu | 1 + > tests/qemu-iotests/common.rc | 25 ++++++++++++++++++++ > 4 files changed, 50 insertions(+), 49 deletions(-) > > diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common > index abacc24114..ee313af92f 100644 > --- a/tests/qemu-iotests/common > +++ b/tests/qemu-iotests/common > @@ -48,6 +48,14 @@ set_prog_path() > fi > } > > +if [ -z "$TEST_DIR" ]; then > + TEST_DIR=`pwd`/scratch
8-space indent looks odd compared to the rest of the file. > @@ -153,6 +158,26 @@ else > fi > ORIG_TEST_IMG="$TEST_IMG" > > +if [ -z "$TEST_DIR" ]; then > + TEST_DIR=`pwd`/scratch We probably ought to clean things up to use $PWD instead of `pwd` everywhere as a minor optimization (why fork, when bash already has the right information for you?) - but that can be separate. Split looks okay to me, Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature