[PATCH] tests/qtest/netdev-socket: Do not test multicast on Darwin

Philippe Mathieu-Daudé posted 1 patch 9 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230918062549.2363-1-philmd@linaro.org
Maintainers: Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
tests/qtest/netdev-socket.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
[PATCH] tests/qtest/netdev-socket: Do not test multicast on Darwin
Posted by Philippe Mathieu-Daudé 9 months ago
Do not run this test on Darwin, otherwise we get:

  qemu-system-arm: -netdev dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: can't add socket to multicast group 230.0.0.1: Can't assign requested address
  Broken pipe
  ../../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
  Abort trap: 6

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/qtest/netdev-socket.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
index 8eed54801f..3fc2ac26d0 100644
--- a/tests/qtest/netdev-socket.c
+++ b/tests/qtest/netdev-socket.c
@@ -401,7 +401,7 @@ static void test_dgram_inet(void)
     qtest_quit(qts0);
 }
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
 static void test_dgram_mcast(void)
 {
     QTestState *qts;
@@ -414,7 +414,9 @@ static void test_dgram_mcast(void)
 
     qtest_quit(qts);
 }
+#endif
 
+#ifndef _WIN32
 static void test_dgram_unix(void)
 {
     QTestState *qts0, *qts1;
@@ -511,7 +513,7 @@ int main(int argc, char **argv)
     if (has_ipv4) {
         qtest_add_func("/netdev/stream/inet/ipv4", test_stream_inet_ipv4);
         qtest_add_func("/netdev/dgram/inet", test_dgram_inet);
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
         qtest_add_func("/netdev/dgram/mcast", test_dgram_mcast);
 #endif
     }
-- 
2.41.0


Re: [PATCH] tests/qtest/netdev-socket: Do not test multicast on Darwin
Posted by Philippe Mathieu-Daudé 9 months ago
I just noticed Jason wasn't Cc'ed. Assuming this test belongs
to "Network device backends", Cc'ing him. (Should we add the
test entry in MAINTAINERS?)

On 18/9/23 08:25, Philippe Mathieu-Daudé wrote:
> Do not run this test on Darwin, otherwise we get:
> 
>    qemu-system-arm: -netdev dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: can't add socket to multicast group 230.0.0.1: Can't assign requested address
>    Broken pipe
>    ../../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
>    Abort trap: 6
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/qtest/netdev-socket.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
> index 8eed54801f..3fc2ac26d0 100644
> --- a/tests/qtest/netdev-socket.c
> +++ b/tests/qtest/netdev-socket.c
> @@ -401,7 +401,7 @@ static void test_dgram_inet(void)
>       qtest_quit(qts0);
>   }
>   
> -#ifndef _WIN32
> +#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
>   static void test_dgram_mcast(void)
>   {
>       QTestState *qts;
> @@ -414,7 +414,9 @@ static void test_dgram_mcast(void)
>   
>       qtest_quit(qts);
>   }
> +#endif
>   
> +#ifndef _WIN32
>   static void test_dgram_unix(void)
>   {
>       QTestState *qts0, *qts1;
> @@ -511,7 +513,7 @@ int main(int argc, char **argv)
>       if (has_ipv4) {
>           qtest_add_func("/netdev/stream/inet/ipv4", test_stream_inet_ipv4);
>           qtest_add_func("/netdev/dgram/inet", test_dgram_inet);
> -#ifndef _WIN32
> +#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
>           qtest_add_func("/netdev/dgram/mcast", test_dgram_mcast);
>   #endif
>       }


Re: [PATCH] tests/qtest/netdev-socket: Do not test multicast on Darwin
Posted by Thomas Huth 9 months ago
On 18/09/2023 08.25, Philippe Mathieu-Daudé wrote:
> Do not run this test on Darwin, otherwise we get:
> 
>    qemu-system-arm: -netdev dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: can't add socket to multicast group 230.0.0.1: Can't assign requested address
>    Broken pipe
>    ../../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
>    Abort trap: 6
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/qtest/netdev-socket.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
> index 8eed54801f..3fc2ac26d0 100644
> --- a/tests/qtest/netdev-socket.c
> +++ b/tests/qtest/netdev-socket.c
> @@ -401,7 +401,7 @@ static void test_dgram_inet(void)
>       qtest_quit(qts0);
>   }
>   
> -#ifndef _WIN32
> +#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
>   static void test_dgram_mcast(void)
>   {
>       QTestState *qts;
> @@ -414,7 +414,9 @@ static void test_dgram_mcast(void)
>   
>       qtest_quit(qts);
>   }
> +#endif
>   
> +#ifndef _WIN32
>   static void test_dgram_unix(void)
>   {
>       QTestState *qts0, *qts1;
> @@ -511,7 +513,7 @@ int main(int argc, char **argv)
>       if (has_ipv4) {
>           qtest_add_func("/netdev/stream/inet/ipv4", test_stream_inet_ipv4);
>           qtest_add_func("/netdev/dgram/inet", test_dgram_inet);
> -#ifndef _WIN32
> +#if !defined(_WIN32) && !defined(CONFIG_DARWIN)
>           qtest_add_func("/netdev/dgram/mcast", test_dgram_mcast);
>   #endif
>       }

Reviewed-by: Thomas Huth <thuth@redhat.com>

I'll queue this for my next pull request.


Re: [PATCH] tests/qtest/netdev-socket: Do not test multicast on Darwin
Posted by Philippe Mathieu-Daudé 9 months ago
On 18/9/23 08:35, Thomas Huth wrote:
> On 18/09/2023 08.25, Philippe Mathieu-Daudé wrote:
>> Do not run this test on Darwin, otherwise we get:
>>
>>    qemu-system-arm: -netdev 
>> dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: 
>> can't add socket to multicast group 230.0.0.1: Can't assign requested 
>> address
>>    Broken pipe
>>    ../../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate 
>> QEMU process but encountered exit status 1 (expected 0)
>>    Abort trap: 6
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   tests/qtest/netdev-socket.c | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)


> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> I'll queue this for my next pull request.

Great, thank you Thomas!