All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Markovic" <amarkovic@wavecomp.com>,
	"Caio Carrara" <ccarrara@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Aleksandar Rikalo" <arikalo@wavecomp.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Fam Zheng" <fam@euphon.net>,
	qemu-s390x@nongnu.org, "Stefan Markovic" <smarkovic@wavecomp.com>
Subject: [Qemu-devel] [PATCH v2 07/20] Acceptance tests: look for target architecture in test tags first
Date: Fri,  1 Feb 2019 19:55:57 -0500	[thread overview]
Message-ID: <20190202005610.24048-8-crosa@redhat.com> (raw)
In-Reply-To: <20190202005610.24048-1-crosa@redhat.com>

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>
---
 docs/devel/testing.rst                    | 4 +++-
 tests/acceptance/avocado_qemu/__init__.py | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index d37c4b0e77..94ef894047 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -697,7 +697,9 @@ scenarios.  For instance, when a QEMU binary is not explicitly given,
 the one selected will depend on this attribute.
 
 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``.
+name.  If one is not given explicitly, it will either be set to
+``None``, or, if the test is tagged with one (and only one)
+``:avocado: tags=arch:VALUE`` tag, it will be set to ``VALUE``.
 
 qemu_bin
 ~~~~~~~~
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index f580582602..9e98d113cb 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)
         default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
         self.qemu_bin = self.params.get('qemu_bin',
                                         default=default_qemu_bin)
-- 
2.20.1

  parent reply	other threads:[~2019-02-02  0:57 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-02  0:55 [Qemu-devel] [PATCH v2 00/20] Acceptance Tests: target architecture support Cleber Rosa
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 01/20] scripts/qemu.py: log QEMU launch command line Cleber Rosa
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 02/20] Acceptance tests: show avocado test execution by default Cleber Rosa
2019-02-06 14:36   ` Cornelia Huck
2019-02-06 17:02     ` Cleber Rosa
2019-02-06 17:20       ` Cornelia Huck
2019-02-06 17:36         ` Cleber Rosa
2019-02-07 10:25           ` Cornelia Huck
2019-02-07 18:32             ` Cleber Rosa
2019-02-08  9:54               ` Cornelia Huck
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 03/20] Acceptance tests: improve docstring on pick_default_qemu_bin() Cleber Rosa
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 04/20] Acceptance tests: fix doc reference to avocado_qemu directory Cleber Rosa
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 05/20] Acceptance tests: introduce arch parameter and attribute Cleber Rosa
2019-02-06 15:40   ` Cornelia Huck
2019-02-07 18:02     ` Cleber Rosa
2019-02-07 18:22       ` Cleber Rosa
2019-02-08 10:10         ` Cornelia Huck
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 06/20] Acceptance tests: use "arch:" tag to filter target specific tests Cleber Rosa
2019-02-02  0:55 ` Cleber Rosa [this message]
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 08/20] Boot Linux Console Test: rename the x86_64 after the arch and machine Cleber Rosa
2019-02-02  0:55 ` [Qemu-devel] [PATCH v2 09/20] Boot Linux Console Test: update the x86_64 kernel Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 10/20] Boot Linux Console Test: add common kernel command line options Cleber Rosa
2019-02-02  1:01   ` Philippe Mathieu-Daudé
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 11/20] Boot Linux Console Test: increase timeout Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 12/20] Boot Linux Console Test: refactor the console watcher into utility method Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 13/20] scripts/qemu.py: support adding a console with the default serial device Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 14/20] Boot Linux Console Test: add a test for mips + malta Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 15/20] Boot Linux Console Test: add a test for mips64el " Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 16/20] Boot Linux Console Test: add a test for ppc64 + pseries Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 17/20] Boot Linux Console Test: add a test for aarch64 + virt Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 18/20] Boot Linux Console Test: add a test for arm " Cleber Rosa
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 19/20] Boot Linux Console Test: add a test for s390x + s390-ccw-virtio Cleber Rosa
2019-02-06 15:44   ` Cornelia Huck
2019-02-02  0:56 ` [Qemu-devel] [PATCH v2 20/20] Boot Linux Console Test: add a test for alpha + clipper Cleber Rosa
2019-02-02 19:20 ` [Qemu-devel] [PATCH v2 00/20] Acceptance Tests: target architecture support no-reply
2019-02-02 19:20 ` no-reply
2019-02-02 19:23 ` no-reply
2019-02-02 19:25 ` no-reply
2019-02-02 19:26 ` no-reply
2019-02-03 17:46 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190202005610.24048-8-crosa@redhat.com \
    --to=crosa@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=amarkovic@wavecomp.com \
    --cc=arikalo@wavecomp.com \
    --cc=aurelien@aurel32.net \
    --cc=ccarrara@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=smarkovic@wavecomp.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.