On Fri, Mar 01, 2019 at 11:27:10AM +0100, Cornelia Huck wrote: > On Wed, 20 Feb 2019 19:57:38 -0500 > Cleber Rosa <[email protected]> wrote: > > > It's useful to define the architecture that should be used in > > situations such as: > > * the intended target of the QEMU binary to be used on tests > > * the architecture of code to be run within the QEMU binary, such > > as a kernel image or a full blown guest OS image > > > > This commit introduces both a test parameter and a test instance > > attribute, that will contain such a value. > > > > Now, when the "arch" test parameter is given, it will influence the > > selection of the default QEMU binary, if one is not given explicitly > > by means of the "qemu_img" parameter. > > > > Signed-off-by: Cleber Rosa <[email protected]> > > Reviewed-by: Philippe Mathieu-Daudé <[email protected]> > > --- > > docs/devel/testing.rst | 28 +++++++++++++++++++++++ > > tests/acceptance/avocado_qemu/__init__.py | 14 +++++++++--- > > 2 files changed, 39 insertions(+), 3 deletions(-) > > > > diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst > > index ceaaafc69f..6035db1b44 100644 > > --- a/docs/devel/testing.rst > > +++ b/docs/devel/testing.rst > > @@ -689,6 +689,21 @@ vm > > A QEMUMachine instance, initially configured according to the given > > ``qemu_bin`` parameter. > > > > +arch > > +~~~~ > > + > > +The architecture can be used on different levels of the stack, e.g. by > > +the framework or by the test itself. At the framework level, it will > > +will currently influence the selection of a QEMU binary (when one is > > s/will will/will/
Thanks for spotting this! > > > +not explicitly given). > > + > > +Tests are also free to use this attribute value, for their own needs. > > +A test may, for instance, use the same value when selecting the > > +architecture of a kernel or disk image to boot a VM with. > > + > > +The ``arch`` attribute will be set to the test parameter of the same > > +name, and if one is not given explicitly, it will be set to ``None``. > > + > > qemu_bin > > ~~~~~~~~ > > > > @@ -711,6 +726,19 @@ like the following: > > > > PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) > > => 'x86_64-softmmu/qemu-system-x86_64 > > > > +arch > > +~~~~ > > + > > +The architecture that will influence the selection of a QEMU binary > > +(when one is not explicitly given). > > + > > +Tests are also free to use this parameter value, for their own needs. > > +A test may, for instance, use the same value when selecting the > > +architecture of a kernel or disk image to boot a VM with. > > + > > +This parameter has a direct relation with the ``arch`` attribute. If > > +not given, it will default to None. > > + > > qemu_bin > > ~~~~~~~~ > > > > diff --git a/tests/acceptance/avocado_qemu/__init__.py > > b/tests/acceptance/avocado_qemu/__init__.py > > index d8d5b48dac..f580582602 100644 > > --- a/tests/acceptance/avocado_qemu/__init__.py > > +++ b/tests/acceptance/avocado_qemu/__init__.py > > @@ -23,16 +23,22 @@ def is_readable_executable_file(path): > > return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) > > > > > > -def pick_default_qemu_bin(): > > +def pick_default_qemu_bin(arch=None): > > """ > > Picks the path of a QEMU binary, starting either in the current working > > directory or in the source tree root directory. > > > > + :param arch: the arch to use when looking for a QEMU binary (the target > > + will match the arch given). If None (the default) arch > > s/None (the default)/None (the default),/ makes that sentence less > confusing :) > Good point, thanks! - Cleber.
