[PATCH 12/17] tests/tcg: ensure s390x-softmmu output redirected

Alex Bennée posted 17 patches 2 months, 1 week ago
There is a newer version of this series
[PATCH 12/17] tests/tcg: ensure s390x-softmmu output redirected
Posted by Alex Bennée 2 months, 1 week ago
The multiarch system tests output serial data which should be
redirected to the "output" chardev rather than echoed to the console.

Remove the unused EXTFLAGS variable while we are at it.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/tcg/s390x/Makefile.softmmu-target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Makefile.softmmu-target
index f60f94b090..ad681bbe40 100644
--- a/tests/tcg/s390x/Makefile.softmmu-target
+++ b/tests/tcg/s390x/Makefile.softmmu-target
@@ -1,6 +1,6 @@
 S390X_SRC=$(SRC_PATH)/tests/tcg/s390x
 VPATH+=$(S390X_SRC)
-QEMU_OPTS+=-action panic=exit-failure -nographic $(EXTFLAGS) -kernel
+QEMU_OPTS+=-action panic=exit-failure -nographic -serial chardev:output -kernel
 LINK_SCRIPT=$(S390X_SRC)/softmmu.ld
 CFLAGS+=-ggdb -O0
 LDFLAGS=-nostdlib -static
-- 
2.39.2


Re: [PATCH 12/17] tests/tcg: ensure s390x-softmmu output redirected
Posted by Thomas Huth 2 months, 1 week ago
On 13/09/2024 19.26, Alex Bennée wrote:
> The multiarch system tests output serial data which should be
> redirected to the "output" chardev rather than echoed to the console.
> 
> Remove the unused EXTFLAGS variable while we are at it.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/tcg/s390x/Makefile.softmmu-target | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Makefile.softmmu-target
> index f60f94b090..ad681bbe40 100644
> --- a/tests/tcg/s390x/Makefile.softmmu-target
> +++ b/tests/tcg/s390x/Makefile.softmmu-target
> @@ -1,6 +1,6 @@
>   S390X_SRC=$(SRC_PATH)/tests/tcg/s390x
>   VPATH+=$(S390X_SRC)
> -QEMU_OPTS+=-action panic=exit-failure -nographic $(EXTFLAGS) -kernel
> +QEMU_OPTS+=-action panic=exit-failure -nographic -serial chardev:output -kernel
>   LINK_SCRIPT=$(S390X_SRC)/softmmu.ld
>   CFLAGS+=-ggdb -O0
>   LDFLAGS=-nostdlib -static

EXTFLAGS has been added on purpose here, see commit 26a09ead7351f117ae780.

  Thomas
Re: [PATCH 12/17] tests/tcg: ensure s390x-softmmu output redirected
Posted by Alex Bennée 2 months, 1 week ago
Thomas Huth <thuth@redhat.com> writes:

> On 13/09/2024 19.26, Alex Bennée wrote:
>> The multiarch system tests output serial data which should be
>> redirected to the "output" chardev rather than echoed to the console.
>> Remove the unused EXTFLAGS variable while we are at it.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>   tests/tcg/s390x/Makefile.softmmu-target | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> diff --git a/tests/tcg/s390x/Makefile.softmmu-target
>> b/tests/tcg/s390x/Makefile.softmmu-target
>> index f60f94b090..ad681bbe40 100644
>> --- a/tests/tcg/s390x/Makefile.softmmu-target
>> +++ b/tests/tcg/s390x/Makefile.softmmu-target
>> @@ -1,6 +1,6 @@
>>   S390X_SRC=$(SRC_PATH)/tests/tcg/s390x
>>   VPATH+=$(S390X_SRC)
>> -QEMU_OPTS+=-action panic=exit-failure -nographic $(EXTFLAGS) -kernel
>> +QEMU_OPTS+=-action panic=exit-failure -nographic -serial chardev:output -kernel
>>   LINK_SCRIPT=$(S390X_SRC)/softmmu.ld
>>   CFLAGS+=-ggdb -O0
>>   LDFLAGS=-nostdlib -static
>
> EXTFLAGS has been added on purpose here, see commit
> 26a09ead7351f117ae780.

ahh missed that as I couldn't see it being used elsewhere. A comment
at the use site would have helped as git blame only gets you so far if
the line has changed multiple times.

>
>  Thomas

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro