* [PATCH 0/4] test: add/document pytest --graphic, --env, --fs
@ 2025-07-08 19:35 Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 1/4] test: update requirement to Labgrid v25.0 Ahmad Fatoum
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2025-07-08 19:35 UTC (permalink / raw)
To: barebox; +Cc: Dang Huynh
The --env and --fs options are very useful for passing stuff into QEMU
without having to assemble images or type stuff into the console.
Document them and add a new --graphic option that spawns either a Bochs
ISA, PCI or a ramfb graphic device depending on the target.
Ahmad Fatoum (4):
test: update requirement to Labgrid v25.0
test: drop now superfluous extra_args
test: document pytest --env and --fs options
test: add support for pytest --graphic
Documentation/boards/emulated.rst | 21 +++++++++++++++++++
conftest.py | 20 +++++++++++++++++-
test/Containerfile | 2 +-
test/arm/a15@multi_v7_defconfig.yaml | 2 +-
test/arm/a9@multi_v7_defconfig.yaml | 2 +-
.../qemu-raspi0@multi_v5_v6_defconfig.yaml | 2 +-
.../qemu-raspi1ap@multi_v5_v6_defconfig.yaml | 2 +-
test/arm/qemu-raspi2b@multi_v7_defconfig.yaml | 2 +-
test/arm/qemu-raspi3b@multi_v8_defconfig.yaml | 1 +
.../qemu-sabrelite@multi_v7_defconfig.yaml | 1 +
test/arm/virt@multi_v7_defconfig.yaml | 2 +-
test/arm/virt@multi_v8_defconfig.yaml | 2 +-
test/mips/be@qemu-malta_defconfig.yaml | 2 +-
test/mips/qemu-malta64el_defconfig.yaml | 2 +-
test/mips/qemu-maltael_defconfig.yaml | 2 +-
test/openrisc/generic_defconfig.yaml | 2 +-
test/riscv/qemu-virt64@rv64i_defconfig.yaml | 2 +-
test/riscv/qemu@virt32_defconfig.yaml | 2 +-
test/riscv/sifive@rv64i_defconfig.yaml | 2 +-
test/strategy.py | 4 ++--
test/x86/pc@efi_defconfig.yaml | 1 +
test/x86/q35@efi_defconfig.yaml | 1 +
test/x86/virtio@efi_defconfig.yaml | 1 +
23 files changed, 62 insertions(+), 18 deletions(-)
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] test: update requirement to Labgrid v25.0
2025-07-08 19:35 [PATCH 0/4] test: add/document pytest --graphic, --env, --fs Ahmad Fatoum
@ 2025-07-08 19:35 ` Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 2/4] test: drop now superfluous extra_args Ahmad Fatoum
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2025-07-08 19:35 UTC (permalink / raw)
To: barebox; +Cc: Dang Huynh, Ahmad Fatoum
This gives us better error messages when QEMU startup fails, allows us
to drop the extra_args key and allows suppressing Labgrid
-display/-nographic option fixups.
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
Documentation/boards/emulated.rst | 6 ++++++
test/Containerfile | 2 +-
test/strategy.py | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Documentation/boards/emulated.rst b/Documentation/boards/emulated.rst
index 99c55d2051c2..44e78eef7fe1 100644
--- a/Documentation/boards/emulated.rst
+++ b/Documentation/boards/emulated.rst
@@ -27,6 +27,12 @@ Labgrid is used to run the barebox test suite, both on real and emulated
hardware. A number of YAML files located in ``test/$ARCH`` describe some
of the virtualized targets that barebox is known to run on.
+barebox makes use of recent labgrid features, so you may need to install
+it directly from PyPI instead of your distro's package repositories::
+
+ pipx install pytest
+ pipx inject pytest labgrid
+
Example usage::
# Run x86 VM runnig the EFI payload from efi_defconfig
diff --git a/test/Containerfile b/test/Containerfile
index 644dc63ad292..fb9bb25bbfc5 100644
--- a/test/Containerfile
+++ b/test/Containerfile
@@ -92,7 +92,7 @@ RUN echo barebox ALL=NOPASSWD: ALL > /etc/sudoers.d/barebox
# install labgrid
RUN pip3 install -q --no-cache-dir --break-system-packages \
- git+https://github.com/labgrid-project/labgrid.git@v24.0 && \
+ git+https://github.com/labgrid-project/labgrid.git@v25.0 && \
ln -s $(which pytest) /usr/local/bin/labgrid-pytest
ENV CROSS_COMPILE_arm=/opt/gcc-${GCC_VERSION}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
diff --git a/test/strategy.py b/test/strategy.py
index 9c91720646b5..11406b97f5f1 100644
--- a/test/strategy.py
+++ b/test/strategy.py
@@ -13,9 +13,9 @@ from labgrid.strategy import Strategy, StrategyError
from labgrid.util import labgrid_version
match = re.match(r'^(\d+?)\.', labgrid_version())
-if match is None or int(match.group(1)) < 24:
+if match is None or int(match.group(1)) < 25:
pytest.exit(f"Labgrid has version v{labgrid_version()}, "
- f"but barebox test suite requires at least v24.")
+ f"but barebox test suite requires at least v25.")
class Status(enum.Enum):
unknown = 0
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/4] test: drop now superfluous extra_args
2025-07-08 19:35 [PATCH 0/4] test: add/document pytest --graphic, --env, --fs Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 1/4] test: update requirement to Labgrid v25.0 Ahmad Fatoum
@ 2025-07-08 19:35 ` Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 3/4] test: document pytest --env and --fs options Ahmad Fatoum
2025-07-08 19:36 ` [PATCH 4/4] test: add support for pytest --graphic Ahmad Fatoum
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2025-07-08 19:35 UTC (permalink / raw)
To: barebox; +Cc: Dang Huynh, Ahmad Fatoum
Labgrid v25.0 allows this to be empty, so let's drop it where unneeded.
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
test/arm/a15@multi_v7_defconfig.yaml | 1 -
test/arm/a9@multi_v7_defconfig.yaml | 1 -
test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml | 1 -
test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml | 1 -
test/arm/qemu-raspi2b@multi_v7_defconfig.yaml | 1 -
test/arm/virt@multi_v7_defconfig.yaml | 1 -
test/arm/virt@multi_v8_defconfig.yaml | 1 -
test/mips/be@qemu-malta_defconfig.yaml | 1 -
test/mips/qemu-malta64el_defconfig.yaml | 1 -
test/mips/qemu-maltael_defconfig.yaml | 1 -
test/openrisc/generic_defconfig.yaml | 1 -
test/riscv/qemu-virt64@rv64i_defconfig.yaml | 1 -
test/riscv/qemu@virt32_defconfig.yaml | 1 -
test/riscv/sifive@rv64i_defconfig.yaml | 1 -
14 files changed, 14 deletions(-)
diff --git a/test/arm/a15@multi_v7_defconfig.yaml b/test/arm/a15@multi_v7_defconfig.yaml
index dfa73fb3f5fd..c7c3e3b0af49 100644
--- a/test/arm/a15@multi_v7_defconfig.yaml
+++ b/test/arm/a15@multi_v7_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: cortex-a15
memory: 1024M
bios: barebox-vexpress-ca15.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/a9@multi_v7_defconfig.yaml b/test/arm/a9@multi_v7_defconfig.yaml
index 8e8220102c90..21ce4202cf90 100644
--- a/test/arm/a9@multi_v7_defconfig.yaml
+++ b/test/arm/a9@multi_v7_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: cortex-a9
memory: 1024M
bios: barebox-vexpress-ca9.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml b/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
index 0a9a727c641f..9cad68225e1e 100644
--- a/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
+++ b/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: arm1176
memory: 512M
kernel: barebox-raspberry-pi.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml b/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
index 0950481a63ea..cbd0686ebd71 100644
--- a/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
+++ b/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: arm1176
memory: 512M
kernel: barebox-raspberry-pi.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml b/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
index 72471c0a7f30..6dc91984ecca 100644
--- a/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
+++ b/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: cortex-a7
memory: 1G
kernel: barebox-raspberry-pi.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/virt@multi_v7_defconfig.yaml b/test/arm/virt@multi_v7_defconfig.yaml
index d8cd6c853bb9..d22b67cb31a8 100644
--- a/test/arm/virt@multi_v7_defconfig.yaml
+++ b/test/arm/virt@multi_v7_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: cortex-a7
memory: 1024M
kernel: barebox-dt-2nd.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/virt@multi_v8_defconfig.yaml b/test/arm/virt@multi_v8_defconfig.yaml
index 8d1de41f8572..0c73591e4513 100644
--- a/test/arm/virt@multi_v8_defconfig.yaml
+++ b/test/arm/virt@multi_v8_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: cortex-a57
memory: 1024M
kernel: barebox-dt-2nd.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/be@qemu-malta_defconfig.yaml b/test/mips/be@qemu-malta_defconfig.yaml
index 5f438e4b900a..2f6de8a43a8f 100644
--- a/test/mips/be@qemu-malta_defconfig.yaml
+++ b/test/mips/be@qemu-malta_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: M14Kc
memory: 256M
bios: barebox-qemu-malta.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/qemu-malta64el_defconfig.yaml b/test/mips/qemu-malta64el_defconfig.yaml
index bf8563e6623b..61318f491aa8 100644
--- a/test/mips/qemu-malta64el_defconfig.yaml
+++ b/test/mips/qemu-malta64el_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: 5KEf
memory: 256M
bios: barebox-qemu-malta.img.swapped
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/qemu-maltael_defconfig.yaml b/test/mips/qemu-maltael_defconfig.yaml
index 1b3f15fec5e9..0571d1b4d495 100644
--- a/test/mips/qemu-maltael_defconfig.yaml
+++ b/test/mips/qemu-maltael_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: M14Kc
memory: 256M
bios: barebox-qemu-malta.img.swapped
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/openrisc/generic_defconfig.yaml b/test/openrisc/generic_defconfig.yaml
index 56b70b8242f0..3d2cd5f9550f 100644
--- a/test/openrisc/generic_defconfig.yaml
+++ b/test/openrisc/generic_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: or1200
memory: 256M
kernel: barebox
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/qemu-virt64@rv64i_defconfig.yaml b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
index 83cdac6c8b9d..f6497de85e54 100644
--- a/test/riscv/qemu-virt64@rv64i_defconfig.yaml
+++ b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: rv64
memory: 256M
kernel: barebox-dt-2nd.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/qemu@virt32_defconfig.yaml b/test/riscv/qemu@virt32_defconfig.yaml
index 03d5ef281592..58a4f918958b 100644
--- a/test/riscv/qemu@virt32_defconfig.yaml
+++ b/test/riscv/qemu@virt32_defconfig.yaml
@@ -8,7 +8,6 @@ targets:
memory: 256M
kernel: barebox-dt-2nd.img
bios: opensbi-riscv32-generic-fw_dynamic.bin
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/sifive@rv64i_defconfig.yaml b/test/riscv/sifive@rv64i_defconfig.yaml
index ce4ea0e1e27e..a35229bddb34 100644
--- a/test/riscv/sifive@rv64i_defconfig.yaml
+++ b/test/riscv/sifive@rv64i_defconfig.yaml
@@ -7,7 +7,6 @@ targets:
cpu: sifive-u54
memory: 256M
kernel: barebox-hifive-unleashed.img
- extra_args: ''
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] test: document pytest --env and --fs options
2025-07-08 19:35 [PATCH 0/4] test: add/document pytest --graphic, --env, --fs Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 1/4] test: update requirement to Labgrid v25.0 Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 2/4] test: drop now superfluous extra_args Ahmad Fatoum
@ 2025-07-08 19:35 ` Ahmad Fatoum
2025-07-08 19:36 ` [PATCH 4/4] test: add support for pytest --graphic Ahmad Fatoum
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2025-07-08 19:35 UTC (permalink / raw)
To: barebox; +Cc: Dang Huynh, Ahmad Fatoum
These two options are really useful to avoid needless typing in QEMU by
making files and environment variables available to barebox from outside.
Document them outside of the pytest --help text as well.
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
Documentation/boards/emulated.rst | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Documentation/boards/emulated.rst b/Documentation/boards/emulated.rst
index 44e78eef7fe1..602def560120 100644
--- a/Documentation/boards/emulated.rst
+++ b/Documentation/boards/emulated.rst
@@ -59,6 +59,18 @@ more easily::
# Run tests and pass a block device (here /dev/virtioblk0)
pytest --lg-env test/arm/virt@multi_v8_defconfig.yaml --blk=rootfs.ext4
+For testing, the QEMU fw_cfg and virtfs support is particularly useful::
+
+ # inject boot.sh file in working directory into barebox environment
+ # at /env/boot/fit and set /env/nv/boot.default to fit
+ pytest --lg-env test/arm/virt@multi_v8_defconfig.yaml \
+ --env nv/boot.default=fit --env boot/fit=@boot.sh
+
+ # make available the host's local working directory in barebox as
+ # /mnt/9p/host
+ pytest --lg-env test/arm/virt@multi_v8_defconfig.yaml \
+ --fs host=.
+
For a complete listing of possible options run ``pytest --help``.
MAKEALL
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] test: add support for pytest --graphic
2025-07-08 19:35 [PATCH 0/4] test: add/document pytest --graphic, --env, --fs Ahmad Fatoum
` (2 preceding siblings ...)
2025-07-08 19:35 ` [PATCH 3/4] test: document pytest --env and --fs options Ahmad Fatoum
@ 2025-07-08 19:36 ` Ahmad Fatoum
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2025-07-08 19:36 UTC (permalink / raw)
To: barebox; +Cc: Dang Huynh, Ahmad Fatoum
This new option will take care to provide a suitable graphics device.
How it's displayed can be customized via --qemu -display $OUTPUT.
For this to work, we must instruct labgrid not to set -nographic or
-display itself, which is possible via setting qemu-default since
Labgrid v25.0.
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
Documentation/boards/emulated.rst | 3 +++
conftest.py | 20 ++++++++++++++++++-
test/arm/a15@multi_v7_defconfig.yaml | 1 +
test/arm/a9@multi_v7_defconfig.yaml | 1 +
.../qemu-raspi0@multi_v5_v6_defconfig.yaml | 1 +
.../qemu-raspi1ap@multi_v5_v6_defconfig.yaml | 1 +
test/arm/qemu-raspi2b@multi_v7_defconfig.yaml | 1 +
test/arm/qemu-raspi3b@multi_v8_defconfig.yaml | 1 +
.../qemu-sabrelite@multi_v7_defconfig.yaml | 1 +
test/arm/virt@multi_v7_defconfig.yaml | 1 +
test/arm/virt@multi_v8_defconfig.yaml | 1 +
test/mips/be@qemu-malta_defconfig.yaml | 1 +
test/mips/qemu-malta64el_defconfig.yaml | 1 +
test/mips/qemu-maltael_defconfig.yaml | 1 +
test/openrisc/generic_defconfig.yaml | 1 +
test/riscv/qemu-virt64@rv64i_defconfig.yaml | 1 +
test/riscv/qemu@virt32_defconfig.yaml | 1 +
test/riscv/sifive@rv64i_defconfig.yaml | 1 +
test/x86/pc@efi_defconfig.yaml | 1 +
test/x86/q35@efi_defconfig.yaml | 1 +
test/x86/virtio@efi_defconfig.yaml | 1 +
21 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/Documentation/boards/emulated.rst b/Documentation/boards/emulated.rst
index 602def560120..dbc869546e2f 100644
--- a/Documentation/boards/emulated.rst
+++ b/Documentation/boards/emulated.rst
@@ -59,6 +59,9 @@ more easily::
# Run tests and pass a block device (here /dev/virtioblk0)
pytest --lg-env test/arm/virt@multi_v8_defconfig.yaml --blk=rootfs.ext4
+ # Run interactively with graphics output
+ pytest --lg-env test/mips/qemu-malta_defconfig.yaml --interactive --graphics
+
For testing, the QEMU fw_cfg and virtfs support is particularly useful::
# inject boot.sh file in working directory into barebox environment
diff --git a/conftest.py b/conftest.py
index 0cdae2126bfd..9131b843d4e4 100644
--- a/conftest.py
+++ b/conftest.py
@@ -51,6 +51,8 @@ def pytest_addoption(parser):
parser.addoption('--dump-dtb', action='store_const', const='qemu_dump_dtb',
dest='lg_initial_state',
help=('(for debugging) skip tests and just dump the Qemu device tree'))
+ parser.addoption('--graphic', '--graphics', action='store_true', dest='qemu_graphics',
+ help=('enable QEMU graphics output'))
parser.addoption('--rng', action='count', dest='qemu_rng',
help=('instantiate Virt I/O random number generator'))
parser.addoption('--console', action='count', dest='qemu_console', default=0,
@@ -77,9 +79,12 @@ def strategy(request, target, pytestconfig):
pytest.exit(e)
try:
- features = target.env.config.data["targets"]["main"]["features"]
+ main = target.env.config.data["targets"]["main"]
+ features = main["features"]
+ qemu_bin = main["drivers"]["QEMUDriver"]["qemu_bin"]
except KeyError:
features = []
+ qemu_bin = None
virtio = None
@@ -111,6 +116,19 @@ def strategy(request, target, pytestconfig):
else:
pytest.exit("barebox currently supports only a single extra virtio console\n", 1)
+ graphics = None
+ if pytestconfig.option.qemu_graphics:
+ if qemu_bin == "qemu-system-x86_64":
+ graphics = '-device isa-vga'
+ elif 'pci' in features:
+ graphics = '-device VGA'
+ elif virtio:
+ graphics = '-vga none -device ramfb'
+ else:
+ pytest.exit("--graphics unsupported for target\n", 1)
+
+ strategy.append_qemu_args(graphics or '-nographic')
+
for i, blk in enumerate(pytestconfig.option.qemu_block):
if virtio:
strategy.append_qemu_args(
diff --git a/test/arm/a15@multi_v7_defconfig.yaml b/test/arm/a15@multi_v7_defconfig.yaml
index c7c3e3b0af49..d62c8e5c414f 100644
--- a/test/arm/a15@multi_v7_defconfig.yaml
+++ b/test/arm/a15@multi_v7_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a15
memory: 1024M
bios: barebox-vexpress-ca15.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/a9@multi_v7_defconfig.yaml b/test/arm/a9@multi_v7_defconfig.yaml
index 21ce4202cf90..6b5528978831 100644
--- a/test/arm/a9@multi_v7_defconfig.yaml
+++ b/test/arm/a9@multi_v7_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a9
memory: 1024M
bios: barebox-vexpress-ca9.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml b/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
index 9cad68225e1e..f9480a44b5f5 100644
--- a/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
+++ b/test/arm/qemu-raspi0@multi_v5_v6_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: arm1176
memory: 512M
kernel: barebox-raspberry-pi.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml b/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
index cbd0686ebd71..62bbd20b6d56 100644
--- a/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
+++ b/test/arm/qemu-raspi1ap@multi_v5_v6_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: arm1176
memory: 512M
kernel: barebox-raspberry-pi.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml b/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
index 6dc91984ecca..d6841d8d65d9 100644
--- a/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
+++ b/test/arm/qemu-raspi2b@multi_v7_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a7
memory: 1G
kernel: barebox-raspberry-pi.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/qemu-raspi3b@multi_v8_defconfig.yaml b/test/arm/qemu-raspi3b@multi_v8_defconfig.yaml
index 4f591ba21596..fddd19757094 100644
--- a/test/arm/qemu-raspi3b@multi_v8_defconfig.yaml
+++ b/test/arm/qemu-raspi3b@multi_v8_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a53
memory: 1G
kernel: barebox-raspberry-pi.img
+ display: qemu-default
extra_args: "\
-serial chardev:serial2 \
-chardev socket,id=serial2,host=localhost,port=2302,nodelay=on,server=on,wait=off"
diff --git a/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml b/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
index 8dc137ee44dc..ee146018f29c 100644
--- a/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
+++ b/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
@@ -8,6 +8,7 @@ targets:
memory: 1024M
kernel: barebox-dt-2nd.img
dtb: imx6q-sabreliste.dtb
+ display: qemu-default
extra_args: '-nographic -serial null'
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
diff --git a/test/arm/virt@multi_v7_defconfig.yaml b/test/arm/virt@multi_v7_defconfig.yaml
index d22b67cb31a8..891581205898 100644
--- a/test/arm/virt@multi_v7_defconfig.yaml
+++ b/test/arm/virt@multi_v7_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a7
memory: 1024M
kernel: barebox-dt-2nd.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/arm/virt@multi_v8_defconfig.yaml b/test/arm/virt@multi_v8_defconfig.yaml
index 0c73591e4513..46caf8820f00 100644
--- a/test/arm/virt@multi_v8_defconfig.yaml
+++ b/test/arm/virt@multi_v8_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: cortex-a57
memory: 1024M
kernel: barebox-dt-2nd.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/be@qemu-malta_defconfig.yaml b/test/mips/be@qemu-malta_defconfig.yaml
index 2f6de8a43a8f..a3d34a660dfb 100644
--- a/test/mips/be@qemu-malta_defconfig.yaml
+++ b/test/mips/be@qemu-malta_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: M14Kc
memory: 256M
bios: barebox-qemu-malta.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/qemu-malta64el_defconfig.yaml b/test/mips/qemu-malta64el_defconfig.yaml
index 61318f491aa8..5562f59dc7d5 100644
--- a/test/mips/qemu-malta64el_defconfig.yaml
+++ b/test/mips/qemu-malta64el_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: 5KEf
memory: 256M
bios: barebox-qemu-malta.img.swapped
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/mips/qemu-maltael_defconfig.yaml b/test/mips/qemu-maltael_defconfig.yaml
index 0571d1b4d495..6cfe99a01633 100644
--- a/test/mips/qemu-maltael_defconfig.yaml
+++ b/test/mips/qemu-maltael_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: M14Kc
memory: 256M
bios: barebox-qemu-malta.img.swapped
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/openrisc/generic_defconfig.yaml b/test/openrisc/generic_defconfig.yaml
index 3d2cd5f9550f..16310093bc0b 100644
--- a/test/openrisc/generic_defconfig.yaml
+++ b/test/openrisc/generic_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: or1200
memory: 256M
kernel: barebox
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/qemu-virt64@rv64i_defconfig.yaml b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
index f6497de85e54..7f86d9ac7de0 100644
--- a/test/riscv/qemu-virt64@rv64i_defconfig.yaml
+++ b/test/riscv/qemu-virt64@rv64i_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: rv64
memory: 256M
kernel: barebox-dt-2nd.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/qemu@virt32_defconfig.yaml b/test/riscv/qemu@virt32_defconfig.yaml
index 58a4f918958b..7860e97c5260 100644
--- a/test/riscv/qemu@virt32_defconfig.yaml
+++ b/test/riscv/qemu@virt32_defconfig.yaml
@@ -8,6 +8,7 @@ targets:
memory: 256M
kernel: barebox-dt-2nd.img
bios: opensbi-riscv32-generic-fw_dynamic.bin
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/riscv/sifive@rv64i_defconfig.yaml b/test/riscv/sifive@rv64i_defconfig.yaml
index a35229bddb34..0b90507f9c3e 100644
--- a/test/riscv/sifive@rv64i_defconfig.yaml
+++ b/test/riscv/sifive@rv64i_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: sifive-u54
memory: 256M
kernel: barebox-hifive-unleashed.img
+ display: qemu-default
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
bootstring: 'commandline:'
diff --git a/test/x86/pc@efi_defconfig.yaml b/test/x86/pc@efi_defconfig.yaml
index ae06fbf69744..632e72ea7bd9 100644
--- a/test/x86/pc@efi_defconfig.yaml
+++ b/test/x86/pc@efi_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: Nehalem
memory: 1024M
kernel: barebox.efi
+ display: qemu-default
extra_args: '-bios OVMF.fd'
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
diff --git a/test/x86/q35@efi_defconfig.yaml b/test/x86/q35@efi_defconfig.yaml
index 578a3654fe9b..be56a36151c6 100644
--- a/test/x86/q35@efi_defconfig.yaml
+++ b/test/x86/q35@efi_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: Nehalem
memory: 1024M
kernel: barebox.efi
+ display: qemu-default
extra_args: '-bios OVMF.fd -global ICH9-LPC.noreboot=false'
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
diff --git a/test/x86/virtio@efi_defconfig.yaml b/test/x86/virtio@efi_defconfig.yaml
index 9ff4ff5a4e5a..0f6b8d2b17de 100644
--- a/test/x86/virtio@efi_defconfig.yaml
+++ b/test/x86/virtio@efi_defconfig.yaml
@@ -7,6 +7,7 @@ targets:
cpu: Nehalem
memory: 1024M
kernel: barebox.efi
+ display: qemu-default
extra_args: '-bios OVMF.fd'
BareboxDriver:
prompt: 'barebox@[^:]+:[^ ]+ '
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-08 20:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-08 19:35 [PATCH 0/4] test: add/document pytest --graphic, --env, --fs Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 1/4] test: update requirement to Labgrid v25.0 Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 2/4] test: drop now superfluous extra_args Ahmad Fatoum
2025-07-08 19:35 ` [PATCH 3/4] test: document pytest --env and --fs options Ahmad Fatoum
2025-07-08 19:36 ` [PATCH 4/4] test: add support for pytest --graphic Ahmad Fatoum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox