| Message ID | 20190117185628.21862-8-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Acceptance Tests: target architecture support | expand |
On Thu, Jan 17, 2019 at 01:56:17PM -0500, Cleber Rosa wrote: > A test can, optionally, be tagged for one or many architectures. If a > test has been tagged for a single architecture, there's a high chance > that the test won't run on other architectures. This changes the > default order of choosing a default target architecture to use based > on the 'arch' tag value first. > > The precedence order is for choosing a QEMU binary to use for a test > is now: > > * qemu_bin parameter > * arch parameter > * arch tag value (for example, x86_64 if ":avocado: tags=arch:x86_64 > is used) > > This means that if one runs: > > $ avocado run -p qemu_bin=/usr/bin/qemu-system-x86_64 test.py > > No arch parameter or tag will influence the selection of the QEMU > target binary. If one runs: > > $ avocado run -p arch=ppc64 test.py > > The target binary selection mechanism will attempt to find a binary > such as "ppc64-softmmu/qemu-system-ppc64". And finally, if one runs > a test that is tagged (in its docstring) with "arch:aarch64": > > $ avocado run aarch64.py > > The target binary selection mechanism will attempt to find a binary > such as "aarch64-softmmu/qemu-system-aarch64". > > At this time, no provision is made to cancel the execution of tests if > the arch parameter given (manually) does not match the test "arch" > tag, but it may be a useful default behavior to be added in the > future. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Caio Carrara <ccarrara@redhat.com> > --- > tests/acceptance/avocado_qemu/__init__.py | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > index 7a38851753..ddbdb7b926 100644 > --- a/tests/acceptance/avocado_qemu/__init__.py > +++ b/tests/acceptance/avocado_qemu/__init__.py > @@ -53,7 +53,12 @@ def pick_default_qemu_bin(arch=None): > class Test(avocado.Test): > def setUp(self): > self.vm = None > - self.arch = self.params.get('arch') > + arches = self.tags.get('arch', []) > + if len(arches) == 1: > + arch = arches.pop() > + else: > + arch = None > + self.arch = self.params.get('arch', default=arch) > self.qemu_bin = self.params.get('qemu_bin', > default=pick_default_qemu_bin(self.arch)) > if self.qemu_bin is None: > -- > 2.20.1 >
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 7a38851753..ddbdb7b926 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -53,7 +53,12 @@ def pick_default_qemu_bin(arch=None): class Test(avocado.Test): def setUp(self): self.vm = None - self.arch = self.params.get('arch') + arches = self.tags.get('arch', []) + if len(arches) == 1: + arch = arches.pop() + else: + arch = None + self.arch = self.params.get('arch', default=arch) self.qemu_bin = self.params.get('qemu_bin', default=pick_default_qemu_bin(self.arch)) if self.qemu_bin is None:
A test can, optionally, be tagged for one or many architectures. If a test has been tagged for a single architecture, there's a high chance that the test won't run on other architectures. This changes the default order of choosing a default target architecture to use based on the 'arch' tag value first. The precedence order is for choosing a QEMU binary to use for a test is now: * qemu_bin parameter * arch parameter * arch tag value (for example, x86_64 if ":avocado: tags=arch:x86_64 is used) This means that if one runs: $ avocado run -p qemu_bin=/usr/bin/qemu-system-x86_64 test.py No arch parameter or tag will influence the selection of the QEMU target binary. If one runs: $ avocado run -p arch=ppc64 test.py The target binary selection mechanism will attempt to find a binary such as "ppc64-softmmu/qemu-system-ppc64". And finally, if one runs a test that is tagged (in its docstring) with "arch:aarch64": $ avocado run aarch64.py The target binary selection mechanism will attempt to find a binary such as "aarch64-softmmu/qemu-system-aarch64". At this time, no provision is made to cancel the execution of tests if the arch parameter given (manually) does not match the test "arch" tag, but it may be a useful default behavior to be added in the future. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/acceptance/avocado_qemu/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)