* [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread)
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
@ 2024-08-16 7:22 ` Thomas Huth
2024-08-16 7:45 ` Philippe Mathieu-Daudé
2024-08-16 7:22 ` [PULL 2/5] meson.build: Check for the availability of __attribute__((gcc_struct)) on MSYS2 Thomas Huth
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 7:22 UTC (permalink / raw)
To: qemu-devel, Richard Henderson
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Found on debian stable.
../target/s390x/tcg/translate.c: In function ‘get_mem_index’:
../target/s390x/tcg/translate.c:398:1: error: control reaches end of non-void function [-Werror=return-type]
398 | }
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240814224132.897098-4-pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/tcg/translate.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index c81e035dea..bcfff40b25 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -392,7 +392,6 @@ static int get_mem_index(DisasContext *s)
return MMU_HOME_IDX;
default:
g_assert_not_reached();
- break;
}
#endif
}
--
2.46.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread)
2024-08-16 7:22 ` [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread) Thomas Huth
@ 2024-08-16 7:45 ` Philippe Mathieu-Daudé
2024-08-16 8:26 ` Thomas Huth
2024-08-16 17:55 ` Pierrick Bouvier
0 siblings, 2 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-08-16 7:45 UTC (permalink / raw)
To: Pierrick Bouvier; +Cc: qemu-devel, Thomas Huth, Richard Henderson
On 16/8/24 09:22, Thomas Huth wrote:
> From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> Found on debian stable.
>
> ../target/s390x/tcg/translate.c: In function ‘get_mem_index’:
> ../target/s390x/tcg/translate.c:398:1: error: control reaches end of non-void function [-Werror=return-type]
> 398 | }
>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
> Message-ID: <20240814224132.897098-4-pierrick.bouvier@linaro.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> target/s390x/tcg/translate.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
> index c81e035dea..bcfff40b25 100644
> --- a/target/s390x/tcg/translate.c
> +++ b/target/s390x/tcg/translate.c
> @@ -392,7 +392,6 @@ static int get_mem_index(DisasContext *s)
> return MMU_HOME_IDX;
> default:
> g_assert_not_reached();
> - break;
Why aren't the other cases problematic?
$ git grep -A1 g_assert_not_reached | fgrep -B1 break
accel/tcg/plugin-gen.c:253: g_assert_not_reached();
accel/tcg/plugin-gen.c-254- break;
--
block/ssh.c:476: g_assert_not_reached();
block/ssh.c-477- break;
--
fpu/softfloat-parts.c.inc:1375: g_assert_not_reached();
fpu/softfloat-parts.c.inc-1376- break;
--
fpu/softfloat-parts.c.inc:1388: g_assert_not_reached();
fpu/softfloat-parts.c.inc-1389- break;
--
hw/gpio/nrf51_gpio.c:42: g_assert_not_reached();
hw/gpio/nrf51_gpio.c-43- break;
--
hw/misc/imx6_ccm.c:303: g_assert_not_reached();
hw/misc/imx6_ccm.c-304- break;
--
hw/misc/mac_via.c:497: g_assert_not_reached();
hw/misc/mac_via.c-498- break;
--
hw/misc/mac_via.c:558: g_assert_not_reached();
hw/misc/mac_via.c-559- break;
--
hw/pci-host/gt64120.c:691: g_assert_not_reached();
hw/pci-host/gt64120.c-692- break;
--
hw/pci-host/gt64120.c:935: g_assert_not_reached();
hw/pci-host/gt64120.c-936- break;
--
hw/scsi/virtio-scsi.c:359: g_assert_not_reached();
hw/scsi/virtio-scsi.c-360- break;
--
hw/tpm/tpm_spapr.c:208: g_assert_not_reached();
hw/tpm/tpm_spapr.c-209- break;
--
target/arm/hyp_gdbstub.c:160: g_assert_not_reached();
target/arm/hyp_gdbstub.c-161- break;
--
target/riscv/insn_trans/trans_rvv.c.inc:3174: g_assert_not_reached();
target/riscv/insn_trans/trans_rvv.c.inc-3175- break;
--
target/riscv/insn_trans/trans_rvv.c.inc:3259: g_assert_not_reached();
target/riscv/insn_trans/trans_rvv.c.inc-3260- break;
--
target/riscv/monitor.c:186: g_assert_not_reached();
target/riscv/monitor.c-187- break;
--
target/s390x/tcg/translate.c:394: g_assert_not_reached();
target/s390x/tcg/translate.c-395- break;
--
tcg/loongarch64/tcg-target.c.inc:652: g_assert_not_reached();
tcg/loongarch64/tcg-target.c.inc-653- break;
--
tests/qtest/migration-helpers.c:78: g_assert_not_reached();
tests/qtest/migration-helpers.c-79- break;
--
ui/qemu-pixman.c:51: g_assert_not_reached();
ui/qemu-pixman.c-52- break;
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread)
2024-08-16 7:45 ` Philippe Mathieu-Daudé
@ 2024-08-16 8:26 ` Thomas Huth
2024-08-16 17:55 ` Pierrick Bouvier
1 sibling, 0 replies; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 8:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Pierrick Bouvier
Cc: qemu-devel, Richard Henderson
On 16/08/2024 09.45, Philippe Mathieu-Daudé wrote:
> On 16/8/24 09:22, Thomas Huth wrote:
>> From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>
>> Found on debian stable.
>>
>> ../target/s390x/tcg/translate.c: In function ‘get_mem_index’:
>> ../target/s390x/tcg/translate.c:398:1: error: control reaches end of
>> non-void function [-Werror=return-type]
>> 398 | }
>>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
>> Message-ID: <20240814224132.897098-4-pierrick.bouvier@linaro.org>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> target/s390x/tcg/translate.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
>> index c81e035dea..bcfff40b25 100644
>> --- a/target/s390x/tcg/translate.c
>> +++ b/target/s390x/tcg/translate.c
>> @@ -392,7 +392,6 @@ static int get_mem_index(DisasContext *s)
>> return MMU_HOME_IDX;
>> default:
>> g_assert_not_reached();
>> - break;
>
> Why aren't the other cases problematic?
No clue, but I guess we can tackle them once anybody runs into a problem in
one of these spots.
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread)
2024-08-16 7:45 ` Philippe Mathieu-Daudé
2024-08-16 8:26 ` Thomas Huth
@ 2024-08-16 17:55 ` Pierrick Bouvier
1 sibling, 0 replies; 13+ messages in thread
From: Pierrick Bouvier @ 2024-08-16 17:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, Thomas Huth, Richard Henderson
On 8/16/24 00:45, Philippe Mathieu-Daudé wrote:
> On 16/8/24 09:22, Thomas Huth wrote:
>> From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>
>> Found on debian stable.
>>
>> ../target/s390x/tcg/translate.c: In function ‘get_mem_index’:
>> ../target/s390x/tcg/translate.c:398:1: error: control reaches end of non-void function [-Werror=return-type]
>> 398 | }
>>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
>> Message-ID: <20240814224132.897098-4-pierrick.bouvier@linaro.org>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> target/s390x/tcg/translate.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
>> index c81e035dea..bcfff40b25 100644
>> --- a/target/s390x/tcg/translate.c
>> +++ b/target/s390x/tcg/translate.c
>> @@ -392,7 +392,6 @@ static int get_mem_index(DisasContext *s)
>> return MMU_HOME_IDX;
>> default:
>> g_assert_not_reached();
>> - break;
>
> Why aren't the other cases problematic?
>
> $ git grep -A1 g_assert_not_reached | fgrep -B1 break
> accel/tcg/plugin-gen.c:253: g_assert_not_reached();
> accel/tcg/plugin-gen.c-254- break;
> --
> block/ssh.c:476: g_assert_not_reached();
> block/ssh.c-477- break;
> --
> fpu/softfloat-parts.c.inc:1375: g_assert_not_reached();
> fpu/softfloat-parts.c.inc-1376- break;
> --
> fpu/softfloat-parts.c.inc:1388: g_assert_not_reached();
> fpu/softfloat-parts.c.inc-1389- break;
> --
> hw/gpio/nrf51_gpio.c:42: g_assert_not_reached();
> hw/gpio/nrf51_gpio.c-43- break;
> --
> hw/misc/imx6_ccm.c:303: g_assert_not_reached();
> hw/misc/imx6_ccm.c-304- break;
> --
> hw/misc/mac_via.c:497: g_assert_not_reached();
> hw/misc/mac_via.c-498- break;
> --
> hw/misc/mac_via.c:558: g_assert_not_reached();
> hw/misc/mac_via.c-559- break;
> --
> hw/pci-host/gt64120.c:691: g_assert_not_reached();
> hw/pci-host/gt64120.c-692- break;
> --
> hw/pci-host/gt64120.c:935: g_assert_not_reached();
> hw/pci-host/gt64120.c-936- break;
> --
> hw/scsi/virtio-scsi.c:359: g_assert_not_reached();
> hw/scsi/virtio-scsi.c-360- break;
> --
> hw/tpm/tpm_spapr.c:208: g_assert_not_reached();
> hw/tpm/tpm_spapr.c-209- break;
> --
> target/arm/hyp_gdbstub.c:160: g_assert_not_reached();
> target/arm/hyp_gdbstub.c-161- break;
> --
> target/riscv/insn_trans/trans_rvv.c.inc:3174: g_assert_not_reached();
> target/riscv/insn_trans/trans_rvv.c.inc-3175- break;
> --
> target/riscv/insn_trans/trans_rvv.c.inc:3259: g_assert_not_reached();
> target/riscv/insn_trans/trans_rvv.c.inc-3260- break;
> --
> target/riscv/monitor.c:186: g_assert_not_reached();
> target/riscv/monitor.c-187- break;
> --
> target/s390x/tcg/translate.c:394: g_assert_not_reached();
> target/s390x/tcg/translate.c-395- break;
> --
> tcg/loongarch64/tcg-target.c.inc:652: g_assert_not_reached();
> tcg/loongarch64/tcg-target.c.inc-653- break;
> --
> tests/qtest/migration-helpers.c:78: g_assert_not_reached();
> tests/qtest/migration-helpers.c-79- break;
> --
> ui/qemu-pixman.c:51: g_assert_not_reached();
> ui/qemu-pixman.c-52- break;
>
I'll take a look at constructions where code is present after
g_assert_not_reached() and make a series out of it to clean this.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 2/5] meson.build: Check for the availability of __attribute__((gcc_struct)) on MSYS2
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
2024-08-16 7:22 ` [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread) Thomas Huth
@ 2024-08-16 7:22 ` Thomas Huth
2024-08-16 7:22 ` [PULL 3/5] tests/avocado: apply proper skipUnless decorator Thomas Huth
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 7:22 UTC (permalink / raw)
To: qemu-devel, Richard Henderson
Since quite a while MSYS2 now supports Clang as a compiler, too.
Unfortunately, this compiler is lacking the __attribute__((gcc_struct))
that we need for compiling on Windows. But since the compiler is
available now, some people started to use it to compile QEMU on MSYS2,
apparently ignoring the compiler warnings (see for example the ticket at
https://gitlab.com/qemu-project/qemu/-/issues/2476 ). These builds are
likely broken in a couple of spots, so let's make sure that we rather
bail out early in the configuration phase instead of allowing the build
to succeed with warnings.
Message-ID: <20240815122719.727639-1-thuth@redhat.com>
Tested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meson.build b/meson.build
index 81ecd4bae7..fbda17c987 100644
--- a/meson.build
+++ b/meson.build
@@ -315,6 +315,11 @@ elif host_os == 'sunos'
qemu_common_flags += '-D__EXTENSIONS__'
elif host_os == 'haiku'
qemu_common_flags += ['-DB_USE_POSITIVE_POSIX_ERRORS', '-D_BSD_SOURCE', '-fPIC']
+elif host_os == 'windows'
+ if not compiler.compiles('struct x { int y; } __attribute__((gcc_struct));',
+ args: '-Werror')
+ error('Your compiler does not support __attribute__((gcc_struct)) - please use GCC instead of Clang')
+ endif
endif
# __sync_fetch_and_and requires at least -march=i486. Many toolchains
--
2.46.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PULL 3/5] tests/avocado: apply proper skipUnless decorator
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
2024-08-16 7:22 ` [PULL 1/5] target/s390x: fix build warning (gcc-12 -fsanitize=thread) Thomas Huth
2024-08-16 7:22 ` [PULL 2/5] meson.build: Check for the availability of __attribute__((gcc_struct)) on MSYS2 Thomas Huth
@ 2024-08-16 7:22 ` Thomas Huth
2024-08-19 22:31 ` Philippe Mathieu-Daudé
2024-08-16 7:22 ` [PULL 4/5] ci: add gtk-vnc to the deps Thomas Huth
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 7:22 UTC (permalink / raw)
To: qemu-devel, Richard Henderson
From: Cleber Rosa <crosa@redhat.com>
Commit 9b45cc993 added many cases of skipUnless for the sake of
organizing flaky tests. But, Python decorators *must* follow what
they decorate, so the newlines added should *not* exist there.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Message-ID: <20240806173119.582857-3-crosa@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/avocado/boot_linux_console.py | 1 -
tests/avocado/intel_iommu.py | 1 -
tests/avocado/linux_initrd.py | 1 -
tests/avocado/machine_aspeed.py | 2 --
tests/avocado/machine_mips_malta.py | 2 --
tests/avocado/machine_rx_gdbsim.py | 1 -
tests/avocado/reverse_debugging.py | 4 ----
tests/avocado/smmu.py | 1 -
8 files changed, 13 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 2929aa042d..cffdd6b5a2 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -1522,7 +1522,6 @@ def test_ppc_mac99(self):
# like issues with a buggy kernel. As a result we don't want it
# gating releases on Gitlab.
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_sh4_r2d(self):
"""
:avocado: tags=arch:sh4
diff --git a/tests/avocado/intel_iommu.py b/tests/avocado/intel_iommu.py
index 008f214397..992583fa7d 100644
--- a/tests/avocado/intel_iommu.py
+++ b/tests/avocado/intel_iommu.py
@@ -13,7 +13,6 @@
from avocado_qemu.linuxtest import LinuxTest
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
class IntelIOMMU(LinuxTest):
"""
:avocado: tags=arch:x86_64
diff --git a/tests/avocado/linux_initrd.py b/tests/avocado/linux_initrd.py
index aad5b19bd9..7f47b98ae7 100644
--- a/tests/avocado/linux_initrd.py
+++ b/tests/avocado/linux_initrd.py
@@ -54,7 +54,6 @@ def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self):
self.assertRegex(self.vm.get_log(), expected_msg)
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_with_2gib_file_should_work_with_linux_v4_16(self):
"""
:avocado: tags=flaky
diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
index f8e263d37e..c0b01e8f1f 100644
--- a/tests/avocado/machine_aspeed.py
+++ b/tests/avocado/machine_aspeed.py
@@ -323,7 +323,6 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
self.wait_for_console_pattern('Starting kernel ...')
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_arm_ast2500_evb_sdk(self):
"""
:avocado: tags=arch:arm
@@ -343,7 +342,6 @@ def test_arm_ast2500_evb_sdk(self):
self.wait_for_console_pattern('nodistro.0 ast2500-default ttyS4')
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_arm_ast2600_evb_sdk(self):
"""
:avocado: tags=arch:arm
diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py
index 8cf84bd805..07a80633b5 100644
--- a/tests/avocado/machine_mips_malta.py
+++ b/tests/avocado/machine_mips_malta.py
@@ -102,7 +102,6 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self):
self.do_test_i6400_framebuffer_logo(1)
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_mips_malta_i6400_framebuffer_logo_7cores(self):
"""
:avocado: tags=arch:mips64el
@@ -114,7 +113,6 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self):
self.do_test_i6400_framebuffer_logo(7)
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_mips_malta_i6400_framebuffer_logo_8cores(self):
"""
:avocado: tags=arch:mips64el
diff --git a/tests/avocado/machine_rx_gdbsim.py b/tests/avocado/machine_rx_gdbsim.py
index 412a7a5089..9a0bec8a6e 100644
--- a/tests/avocado/machine_rx_gdbsim.py
+++ b/tests/avocado/machine_rx_gdbsim.py
@@ -49,7 +49,6 @@ def test_uboot(self):
#exec_command_and_wait_for_pattern(self, 'version', gcc_version)
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_linux_sash(self):
"""
Boots a Linux kernel and checks that the console is operational.
diff --git a/tests/avocado/reverse_debugging.py b/tests/avocado/reverse_debugging.py
index 92855a02a5..f24287cd0a 100644
--- a/tests/avocado/reverse_debugging.py
+++ b/tests/avocado/reverse_debugging.py
@@ -207,7 +207,6 @@ def get_pc(self, g):
# unidentified gitlab timeout problem
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_x86_64_pc(self):
"""
:avocado: tags=arch:x86_64
@@ -225,7 +224,6 @@ class ReverseDebugging_AArch64(ReverseDebugging):
# unidentified gitlab timeout problem
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_aarch64_virt(self):
"""
:avocado: tags=arch:aarch64
@@ -250,7 +248,6 @@ class ReverseDebugging_ppc64(ReverseDebugging):
# unidentified gitlab timeout problem
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_ppc64_pseries(self):
"""
:avocado: tags=arch:ppc64
@@ -265,7 +262,6 @@ def test_ppc64_pseries(self):
# See https://gitlab.com/qemu-project/qemu/-/issues/1992
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
def test_ppc64_powernv(self):
"""
:avocado: tags=arch:ppc64
diff --git a/tests/avocado/smmu.py b/tests/avocado/smmu.py
index aadda71e4b..83fd79e922 100644
--- a/tests/avocado/smmu.py
+++ b/tests/avocado/smmu.py
@@ -14,7 +14,6 @@
from avocado_qemu.linuxtest import LinuxTest
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
-
class SMMU(LinuxTest):
"""
:avocado: tags=accel:kvm
--
2.46.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PULL 3/5] tests/avocado: apply proper skipUnless decorator
2024-08-16 7:22 ` [PULL 3/5] tests/avocado: apply proper skipUnless decorator Thomas Huth
@ 2024-08-19 22:31 ` Philippe Mathieu-Daudé
2024-08-20 8:03 ` Thomas Huth
0 siblings, 1 reply; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-08-19 22:31 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Richard Henderson
On 16/8/24 09:22, Thomas Huth wrote:
> From: Cleber Rosa <crosa@redhat.com>
>
> Commit 9b45cc993 added many cases of skipUnless for the sake of
> organizing flaky tests. But, Python decorators *must* follow what
> they decorate, so the newlines added should *not* exist there.
>
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> Message-ID: <20240806173119.582857-3-crosa@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/avocado/boot_linux_console.py | 1 -
> tests/avocado/intel_iommu.py | 1 -
> tests/avocado/linux_initrd.py | 1 -
> tests/avocado/machine_aspeed.py | 2 --
> tests/avocado/machine_mips_malta.py | 2 --
> tests/avocado/machine_rx_gdbsim.py | 1 -
> tests/avocado/reverse_debugging.py | 4 ----
> tests/avocado/smmu.py | 1 -
> 8 files changed, 13 deletions(-)
> diff --git a/tests/avocado/machine_rx_gdbsim.py b/tests/avocado/machine_rx_gdbsim.py
> index 412a7a5089..9a0bec8a6e 100644
> --- a/tests/avocado/machine_rx_gdbsim.py
> +++ b/tests/avocado/machine_rx_gdbsim.py
> @@ -49,7 +49,6 @@ def test_uboot(self):
> #exec_command_and_wait_for_pattern(self, 'version', gcc_version)
>
> @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
> -
> def test_linux_sash(self):
> """
> Boots a Linux kernel and checks that the console is operational.
For some weird reason a part of this patch is missing...
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PULL 3/5] tests/avocado: apply proper skipUnless decorator
2024-08-19 22:31 ` Philippe Mathieu-Daudé
@ 2024-08-20 8:03 ` Thomas Huth
2024-08-20 8:06 ` Thomas Huth
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2024-08-20 8:03 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel, Richard Henderson
On 20/08/2024 00.31, Philippe Mathieu-Daudé wrote:
> On 16/8/24 09:22, Thomas Huth wrote:
>> From: Cleber Rosa <crosa@redhat.com>
>>
>> Commit 9b45cc993 added many cases of skipUnless for the sake of
>> organizing flaky tests. But, Python decorators *must* follow what
>> they decorate, so the newlines added should *not* exist there.
>>
>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Tested-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>> Message-ID: <20240806173119.582857-3-crosa@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/avocado/boot_linux_console.py | 1 -
>> tests/avocado/intel_iommu.py | 1 -
>> tests/avocado/linux_initrd.py | 1 -
>> tests/avocado/machine_aspeed.py | 2 --
>> tests/avocado/machine_mips_malta.py | 2 --
>> tests/avocado/machine_rx_gdbsim.py | 1 -
>> tests/avocado/reverse_debugging.py | 4 ----
>> tests/avocado/smmu.py | 1 -
>> 8 files changed, 13 deletions(-)
>
>
>> diff --git a/tests/avocado/machine_rx_gdbsim.py
>> b/tests/avocado/machine_rx_gdbsim.py
>> index 412a7a5089..9a0bec8a6e 100644
>> --- a/tests/avocado/machine_rx_gdbsim.py
>> +++ b/tests/avocado/machine_rx_gdbsim.py
>> @@ -49,7 +49,6 @@ def test_uboot(self):
>> #exec_command_and_wait_for_pattern(self, 'version', gcc_version)
>> @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on
>> GitLab')
>> -
>> def test_linux_sash(self):
>> """
>> Boots a Linux kernel and checks that the console is operational.
>
> For some weird reason a part of this patch is missing...
I dropped it on purpose since there was another patch on the list that drops
that decorator completely.
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PULL 3/5] tests/avocado: apply proper skipUnless decorator
2024-08-20 8:03 ` Thomas Huth
@ 2024-08-20 8:06 ` Thomas Huth
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Huth @ 2024-08-20 8:06 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel, Richard Henderson
On 20/08/2024 10.03, Thomas Huth wrote:
> On 20/08/2024 00.31, Philippe Mathieu-Daudé wrote:
>> On 16/8/24 09:22, Thomas Huth wrote:
>>> From: Cleber Rosa <crosa@redhat.com>
>>>
>>> Commit 9b45cc993 added many cases of skipUnless for the sake of
>>> organizing flaky tests. But, Python decorators *must* follow what
>>> they decorate, so the newlines added should *not* exist there.
>>>
>>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>>> Tested-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>>> Message-ID: <20240806173119.582857-3-crosa@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> tests/avocado/boot_linux_console.py | 1 -
>>> tests/avocado/intel_iommu.py | 1 -
>>> tests/avocado/linux_initrd.py | 1 -
>>> tests/avocado/machine_aspeed.py | 2 --
>>> tests/avocado/machine_mips_malta.py | 2 --
>>> tests/avocado/machine_rx_gdbsim.py | 1 -
>>> tests/avocado/reverse_debugging.py | 4 ----
>>> tests/avocado/smmu.py | 1 -
>>> 8 files changed, 13 deletions(-)
>>
>>
>>> diff --git a/tests/avocado/machine_rx_gdbsim.py
>>> b/tests/avocado/machine_rx_gdbsim.py
>>> index 412a7a5089..9a0bec8a6e 100644
>>> --- a/tests/avocado/machine_rx_gdbsim.py
>>> +++ b/tests/avocado/machine_rx_gdbsim.py
>>> @@ -49,7 +49,6 @@ def test_uboot(self):
>>> #exec_command_and_wait_for_pattern(self, 'version', gcc_version)
>>> @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable
>>> on GitLab')
>>> -
>>> def test_linux_sash(self):
>>> """
>>> Boots a Linux kernel and checks that the console is operational.
>>
>> For some weird reason a part of this patch is missing...
>
> I dropped it on purpose since there was another patch on the list that drops
> that decorator completely.
This one here, it's even yours ;-) :
https://gitlab.com/qemu-project/qemu/-/commit/8a69613e9ccac6c9eb97fb969348284469fd9395
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 4/5] ci: add gtk-vnc to the deps
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
` (2 preceding siblings ...)
2024-08-16 7:22 ` [PULL 3/5] tests/avocado: apply proper skipUnless decorator Thomas Huth
@ 2024-08-16 7:22 ` Thomas Huth
2024-08-16 7:22 ` [PULL 5/5] ci: refresh package lists with lcitool Thomas Huth
2024-08-16 11:50 ` [PULL 0/5] Some small tests and s390x fixes Richard Henderson
5 siblings, 0 replies; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 7:22 UTC (permalink / raw)
To: qemu-devel, Richard Henderson
From: Daniel P. Berrangé <berrange@redhat.com>
The gtk-vnc package is used by the vnc-display-test qtest
program. Technically only gvnc is needed, but since we
already pull in the gtk3 dep, it is harmless to depend
on gtk-vnc.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240718094159.902024-2-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/projects/qemu.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 0c85784259..252e871f80 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -32,6 +32,7 @@ packages:
- glusterfs
- gnutls
- gtk3
+ - gtk-vnc
- hostname
- json-c
- libaio
--
2.46.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PULL 5/5] ci: refresh package lists with lcitool
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
` (3 preceding siblings ...)
2024-08-16 7:22 ` [PULL 4/5] ci: add gtk-vnc to the deps Thomas Huth
@ 2024-08-16 7:22 ` Thomas Huth
2024-08-16 11:50 ` [PULL 0/5] Some small tests and s390x fixes Richard Henderson
5 siblings, 0 replies; 13+ messages in thread
From: Thomas Huth @ 2024-08-16 7:22 UTC (permalink / raw)
To: qemu-devel, Richard Henderson
From: Daniel P. Berrangé <berrange@redhat.com>
Refresh with the newly added gtk-vnc package
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240718094159.902024-3-berrange@redhat.com>
[thuth: fixed conflicts in .gitlab-ci.d/cirrus/*.vars]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-14.vars | 2 +-
scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 +
scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 +
tests/docker/dockerfiles/alpine.docker | 1 +
tests/docker/dockerfiles/debian-amd64-cross.docker | 1 +
tests/docker/dockerfiles/debian-arm64-cross.docker | 1 +
tests/docker/dockerfiles/debian-armel-cross.docker | 1 +
tests/docker/dockerfiles/debian-armhf-cross.docker | 1 +
tests/docker/dockerfiles/debian-i686-cross.docker | 1 +
tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 +
tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 +
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 +
tests/docker/dockerfiles/debian-s390x-cross.docker | 1 +
tests/docker/dockerfiles/debian.docker | 1 +
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 1 +
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/docker/dockerfiles/ubuntu2204.docker | 1 +
tests/vm/generated/freebsd.json | 1 +
21 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 29ab9645f9..69c948b503 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-sphinx py311-sphinx_rtd_theme py311-tomli py311-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-sphinx py311-sphinx_rtd_theme py311-tomli py311-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-13.vars b/.gitlab-ci.d/cirrus/macos-13.vars
index 534f029956..ac3fa3a847 100644
--- a/.gitlab-ci.d/cirrus/macos-13.vars
+++ b/.gitlab-ci.d/cirrus/macos-13.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars
index 43070f4a26..24cfec3b89 100644
--- a/.gitlab-ci.d/cirrus/macos-14.vars
+++ b/.gitlab-ci.d/cirrus/macos-14.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
index fd5489cd82..71a0f0c433 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
@@ -49,6 +49,7 @@ packages:
- libglusterfs-dev
- libgnutls28-dev
- libgtk-3-dev
+ - libgtk-vnc-2.0-dev
- libibverbs-dev
- libiscsi-dev
- libjemalloc-dev
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
index afa04502cf..d8de967b18 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
@@ -49,6 +49,7 @@ packages:
- libglusterfs-dev
- libgnutls28-dev
- libgtk-3-dev
+ - libgtk-vnc-2.0-dev
- libibverbs-dev
- libiscsi-dev
- libjemalloc-dev
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index b079a83fe2..54b9721997 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -40,6 +40,7 @@ RUN apk update && \
glib-static \
gnutls-dev \
gtk+3.0-dev \
+ gtk-vnc-dev \
json-c-dev \
libaio-dev \
libbpf-dev \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 8058695979..136c3a79a1 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 15457d7657..233f6ee1de 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index c26ffc2e9e..8476fc8cce 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 8f87656d89..f26385e0b9 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index f4ef054a2e..3fe8ee623d 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 59c4c68dce..2862785692 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 880c774f1c..0d559ae4ba 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 1d55b9514c..8c1dcec9cf 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 62ccda6ab1..72668e0315 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libglib2.0-dev \
+ libgtk-vnc-2.0-dev \
libpcre2-dev \
libsndio-dev \
libspice-protocol-dev \
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index 0d1d401eb8..42bd0067d1 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglusterfs-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libgtk-vnc-2.0-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 007e1574bd..6b264d901f 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -34,6 +34,7 @@ exec "$@"\n' > /usr/bin/nosync && \
git \
glib2-devel \
glibc-langpack-en \
+ gtk-vnc2-devel \
hostname \
llvm \
make \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 44f239c088..ecdefaff1a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -50,6 +50,7 @@ exec "$@"\n' > /usr/bin/nosync && \
glibc-static \
glusterfs-api-devel \
gnutls-devel \
+ gtk-vnc2-devel \
gtk3-devel \
hostname \
jemalloc-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 836f531ac1..66143621fe 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -33,6 +33,7 @@ RUN zypper update -y && \
glibc-locale \
glibc-static \
glusterfs-devel \
+ gtk-vnc-devel \
gtk3-devel \
hostname \
jemalloc-devel \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index beeb44fc28..3a7de6a318 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglusterfs-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libgtk-vnc-2.0-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json
index 2a361cecd0..d5f0b62ec1 100644
--- a/tests/vm/generated/freebsd.json
+++ b/tests/vm/generated/freebsd.json
@@ -29,6 +29,7 @@
"gmake",
"gnutls",
"gsed",
+ "gtk-vnc",
"gtk3",
"json-c",
"libepoxy",
--
2.46.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PULL 0/5] Some small tests and s390x fixes
2024-08-16 7:22 [PULL 0/5] Some small tests and s390x fixes Thomas Huth
` (4 preceding siblings ...)
2024-08-16 7:22 ` [PULL 5/5] ci: refresh package lists with lcitool Thomas Huth
@ 2024-08-16 11:50 ` Richard Henderson
5 siblings, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2024-08-16 11:50 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
On 8/16/24 17:22, Thomas Huth wrote:
> Hi Richard!
>
> The following changes since commit b0d6c037ea0a825192285f149af72a73a1baaa04:
>
> Update version for v9.1.0-rc2 release (2024-08-15 20:32:37 +1000)
>
> are available in the Git repository at:
>
> https://gitlab.com/thuth/qemu.git tags/pull-request-2024-08-16
>
> for you to fetch changes up to b4be15a9f9e73fa2e7c46da559f10afc94018984:
>
> ci: refresh package lists with lcitool (2024-08-16 09:16:03 +0200)
>
> ----------------------------------------------------------------
> * Fix a potential build warning in the s390x target code
> * Check for the availability of __attribute__((gcc_struct)) on MSYS2
> * Fix skipUnless decorators in Avocado tests
> * Add missing gtk-vnc package to the CI jobs
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.
r~
^ permalink raw reply [flat|nested] 13+ messages in thread