[PATCH] fixup! test: add --bootarg option when running under QEMU

[PATCH] fixup! test: add --bootarg option when running under QEMU

[Ahmad Fatoum]

test: qemu: pass -nographic in the default case.

Otherwise, we end up with an error message if the default is to use a
graphic backend.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 conftest.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/conftest.py b/conftest.py
index 45e8835924b3..e8de5952efb4 100644
--- a/conftest.py
+++ b/conftest.py
@@ -116,9 +116,10 @@ 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":
+    if qemu_bin is not None:
+        if not pytestconfig.option.qemu_graphics:
+            graphics = '-nographic'
+        elif qemu_bin == "qemu-system-x86_64":
             graphics = '-device isa-vga'
         elif 'pci' in features:
             graphics = '-device VGA'
-- 
2.39.5

Re: [PATCH] fixup! test: add --bootarg option when running under QEMU

[Ahmad Fatoum]

Please dismiss this one. Fixup is for wrong commit.
Correct one just sent out.

On 8/6/25 18:30, Ahmad Fatoum wrote:
> test: qemu: pass -nographic in the default case.
> 
> Otherwise, we end up with an error message if the default is to use a
> graphic backend.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  conftest.py | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/conftest.py b/conftest.py
> index 45e8835924b3..e8de5952efb4 100644
> --- a/conftest.py
> +++ b/conftest.py
> @@ -116,9 +116,10 @@ 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":
> +    if qemu_bin is not None:
> +        if not pytestconfig.option.qemu_graphics:
> +            graphics = '-nographic'
> +        elif qemu_bin == "qemu-system-x86_64":
>              graphics = '-device isa-vga'
>          elif 'pci' in features:
>              graphics = '-device VGA'

-- 
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 |