[PATCH 1/3] test: populate qemu_bin, even if missing features

[PATCH 1/3] test: populate qemu_bin, even if missing features

[Ahmad Fatoum]

If the YAML lists no features, the lookup for qemu_bin is prematurely
aborted, even for QEMU environment configs.

Split up the try/except clauses to fix this.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 conftest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index fa088b1cac81..55935f7602f7 100644
--- a/conftest.py
+++ b/conftest.py
@@ -134,9 +134,13 @@ def strategy(request, target, pytestconfig):  # noqa: max-complexity=30
     try:
         main = target.env.config.data["targets"]["main"]
         features = main["features"]
-        qemu_bin = main["drivers"]["QEMUDriver"]["qemu_bin"]
     except KeyError:
         features = []
+
+    try:
+        main = target.env.config.data["targets"]["main"]
+        qemu_bin = main["drivers"]["QEMUDriver"]["qemu_bin"]
+    except KeyError:
         qemu_bin = None
 
     virtio = None
-- 
2.47.3

[PATCH 2/3] test: arm: qemu-sabrelite: drop -nographic

[Ahmad Fatoum]

-nographic is inserted by conftest.py, unless --graphic was passed to
pytest, so it should be dropped from individual YAML configs to allow
graphical operation.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 test/arm/qemu-sabrelite@multi_v7_defconfig.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml b/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
index ee146018f29c..541272e8b12c 100644
--- a/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
+++ b/test/arm/qemu-sabrelite@multi_v7_defconfig.yaml
@@ -9,7 +9,7 @@ targets:
         kernel: barebox-dt-2nd.img
         dtb: imx6q-sabreliste.dtb
         display: qemu-default
-        extra_args: '-nographic -serial null'
+        extra_args: '-serial null'
       BareboxDriver:
         prompt: 'barebox@[^:]+:[^ ]+ '
         bootstring: 'commandline:'
-- 
2.47.3

[PATCH 3/3] test: arm: qemu-raspi1ap the default multi_v5_v6_defconfig.yaml

[Ahmad Fatoum]

This allows running pytest without --lg-env argument after having built
multi_v5_v6_defconfig.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 test/arm/multi_v5_v6_defconfig.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 test/arm/multi_v5_v6_defconfig.yaml

diff --git a/test/arm/multi_v5_v6_defconfig.yaml b/test/arm/multi_v5_v6_defconfig.yaml
new file mode 120000
index 000000000000..5131c0b82c3d
--- /dev/null
+++ b/test/arm/multi_v5_v6_defconfig.yaml
@@ -0,0 +1 @@
+qemu-raspi1ap@multi_v5_v6_defconfig.yaml
\ No newline at end of file
-- 
2.47.3

Re: [PATCH 3/3] test: arm: qemu-raspi1ap the default multi_v5_v6_defconfig.yaml

[Sascha Hauer]

"qemu-raspi1ap the default multi_v5_v6_defconfig.yaml" doesn't have a
verb, I am not sure how the sentence was meant to read.

Sascha

On Fri, Nov 28, 2025 at 06:21:03PM +0100, Ahmad Fatoum wrote:
> This allows running pytest without --lg-env argument after having built
> multi_v5_v6_defconfig.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  test/arm/multi_v5_v6_defconfig.yaml | 1 +
>  1 file changed, 1 insertion(+)
>  create mode 120000 test/arm/multi_v5_v6_defconfig.yaml
> 
> diff --git a/test/arm/multi_v5_v6_defconfig.yaml b/test/arm/multi_v5_v6_defconfig.yaml
> new file mode 120000
> index 000000000000..5131c0b82c3d
> --- /dev/null
> +++ b/test/arm/multi_v5_v6_defconfig.yaml
> @@ -0,0 +1 @@
> +qemu-raspi1ap@multi_v5_v6_defconfig.yaml
> \ No newline at end of file
> -- 
> 2.47.3
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 3/3] test: arm: qemu-raspi1ap the default multi_v5_v6_defconfig.yaml

[Ahmad Fatoum]

On 12/1/25 10:45 AM, Sascha Hauer wrote:
> "qemu-raspi1ap the default multi_v5_v6_defconfig.yaml" doesn't have a
> verb, I am not sure how the sentence was meant to read.

The missing verb is a "make" at the beginning.

Thanks,
Ahmad

> 
> Sascha
> 
> On Fri, Nov 28, 2025 at 06:21:03PM +0100, Ahmad Fatoum wrote:
>> This allows running pytest without --lg-env argument after having built
>> multi_v5_v6_defconfig.
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  test/arm/multi_v5_v6_defconfig.yaml | 1 +
>>  1 file changed, 1 insertion(+)
>>  create mode 120000 test/arm/multi_v5_v6_defconfig.yaml
>>
>> diff --git a/test/arm/multi_v5_v6_defconfig.yaml b/test/arm/multi_v5_v6_defconfig.yaml
>> new file mode 120000
>> index 000000000000..5131c0b82c3d
>> --- /dev/null
>> +++ b/test/arm/multi_v5_v6_defconfig.yaml
>> @@ -0,0 +1 @@
>> +qemu-raspi1ap@multi_v5_v6_defconfig.yaml
>> \ No newline at end of file
>> -- 
>> 2.47.3
>>
>>
>>
> 

-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

Re: [PATCH 1/3] test: populate qemu_bin, even if missing features

[Sascha Hauer]

On Fri, 28 Nov 2025 18:21:01 +0100, Ahmad Fatoum wrote:
> If the YAML lists no features, the lookup for qemu_bin is prematurely
> aborted, even for QEMU environment configs.
> 
> Split up the try/except clauses to fix this.
> 
> 

Applied, thanks!

[1/3] test: populate qemu_bin, even if missing features
      https://git.pengutronix.de/cgit/barebox/commit/?id=0f474e5b689f (link may not be stable)
[2/3] test: arm: qemu-sabrelite: drop -nographic
      https://git.pengutronix.de/cgit/barebox/commit/?id=3b728280cafe (link may not be stable)
[3/3] test: arm: qemu-raspi1ap the default multi_v5_v6_defconfig.yaml
      https://git.pengutronix.de/cgit/barebox/commit/?id=14319684cc39 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>