[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/19] tests/acceptance: use "arch:" tag to filter ta
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 05/19] tests/acceptance: use "arch:" tag to filter target specific tests |
Date: |
Thu, 2 May 2019 21:41:16 -0300 |
From: Cleber Rosa <address@hidden>
Currently, some tests contains target architecture information, in the
form of a "x86_64" tag. But that tag is not respected in the default
execution, that is, "make check-acceptance" doesn't do anything with
it.
That said, even the target architecture handling currently present in
the "avocado_qemu.Test" class is pretty limited. For instance, by
default, it chooses a target based on the host architecture.
Because the original implementation of the tags feature in Avocado did
not include any time of namespace or "key:val" mechanism, no tag has
relation to another tag. The new implementation of the tags feature
from version 67.0 onwards, allows "key:val" tags, and because of that,
a test can be classified with a tag in a given key. For instance, the
new proposed version of the "boot_linux_console.py" test, which
downloads and attempts to run a x86_64 kernel, is now tagged as:
:avocado: tags=arch:x86_64
This means that it can be filtered (out) when no x86_64 target is
available. At the same time, tests that don't have a "arch:" tag,
will not be filtered out.
Signed-off-by: Cleber Rosa <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/Makefile.include | 3 +++
tests/acceptance/boot_linux_console.py | 2 +-
tests/acceptance/linux_initrd.py | 2 +-
tests/acceptance/virtio_version.py | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 445aa0bb12..7c8b9c84b2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1134,6 +1134,7 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
# Any number of command separated loggers are accepted. For more
# information please refer to "avocado --help".
AVOCADO_SHOW=app
+AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter
%-softmmu,$(TARGET_DIRS)))
ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
@@ -1159,6 +1160,8 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
$(call quiet-command, \
$(TESTS_VENV_DIR)/bin/python -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
+ --filter-by-tags-include-empty --filter-by-tags-include-empty-key \
+ $(AVOCADO_TAGS) \
--failfast=on $(SRC_PATH)/tests/acceptance, \
"AVOCADO", "tests/acceptance")
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index beeb1e59e8..fa4594f612 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -18,7 +18,7 @@ class BootLinuxConsole(Test):
Boots a x86_64 Linux kernel and checks that the console is operational
and the kernel command line is properly passed from QEMU to the kernel
- :avocado: tags=x86_64
+ :avocado: tags=arch:x86_64
"""
timeout = 60
diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py
index fbdb48e43f..23be5a63aa 100644
--- a/tests/acceptance/linux_initrd.py
+++ b/tests/acceptance/linux_initrd.py
@@ -19,7 +19,7 @@ class LinuxInitrd(Test):
"""
Checks QEMU evaluates correctly the initrd file passed as -initrd option.
- :avocado: tags=x86_64
+ :avocado: tags=arch:x86_64
"""
timeout = 300
diff --git a/tests/acceptance/virtio_version.py
b/tests/acceptance/virtio_version.py
index 37fc01ea18..8b97453ff8 100644
--- a/tests/acceptance/virtio_version.py
+++ b/tests/acceptance/virtio_version.py
@@ -61,7 +61,7 @@ class VirtioVersionCheck(Test):
same device tree created by `disable-modern` and
`disable-legacy`.
- :avocado: tags=x86_64
+ :avocado: tags=arch:x86_64
"""
# just in case there are failures, show larger diff:
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/19] Python queue, 2019-05-02, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 01/19] tests/acceptance: show avocado test execution by default, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 02/19] tests/acceptance: improve docstring on pick_default_qemu_bin(), Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 03/19] tests/acceptance: fix doc reference to avocado_qemu directory, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 04/19] tests/acceptance: introduce arch parameter and attribute, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 05/19] tests/acceptance: use "arch:" tag to filter target specific tests,
Eduardo Habkost <=
- [Qemu-devel] [PULL 06/19] tests/acceptance: look for target architecture in test tags first, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 07/19] tests/boot_linux_console: rename the x86_64 after the arch and machine, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 08/19] tests/boot_linux_console: update the x86_64 kernel, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 09/19] tests/boot_linux_console: add common kernel command line options, Eduardo Habkost, 2019/05/02
- [Qemu-devel] [PULL 10/19] tests/boot_linux_console: increase timeout, Eduardo Habkost, 2019/05/02