[Spice-devel] [PATCH spice-server 24/33] test-listen: Exclude Unix sockets part under Windows

Marc-André Lureau marcandre.lureau at gmail.com
Sat Dec 22 10:18:11 UTC 2018


On Fri, Dec 21, 2018 at 4:04 PM Frediano Ziglio <fziglio at redhat.com> wrote:
>
> Windows does not support Unix sockets.
>
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau at redhat.com>


> ---
>  server/tests/test-listen.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/server/tests/test-listen.c b/server/tests/test-listen.c
> index 640e8f12..2fd4b5a3 100644
> --- a/server/tests/test-listen.c
> +++ b/server/tests/test-listen.c
> @@ -27,7 +27,9 @@
>  #include <stdint.h>
>  #include <string.h>
>  #include <gio/gio.h>
> +#ifndef _WIN32
>  #include <gio/gunixsocketaddress.h>
> +#endif
>
>  #include "test-glib-compat.h"
>
> @@ -211,7 +213,11 @@ static GThread *fake_client_new(GThreadFunc thread_func,
>      ThreadData *thread_data = g_new0(ThreadData, 1);
>
>      if (port == -1) {
> +#ifndef _WIN32
>          thread_data->connectable = G_SOCKET_CONNECTABLE(g_unix_socket_address_new(hostname));
> +#else
> +        g_assert_not_reached();
> +#endif
>      } else {
>          g_assert_cmpuint(port, >, 0);
>          g_assert_cmpuint(port, <, 65536);
> @@ -317,6 +323,7 @@ static void test_connect_plain_and_tls(void)
>      spice_server_destroy(server);
>  }
>
> +#ifndef _WIN32
>  static void test_connect_unix(void)
>  {
>      GThread *thread;
> @@ -342,6 +349,7 @@ static void test_connect_unix(void)
>      test_event_loop_destroy(&event_loop);
>      spice_server_destroy(server);
>  }
> +#endif
>
>  static void test_connect_ko(void)
>  {
> @@ -365,7 +373,9 @@ int main(int argc, char **argv)
>      g_test_add_func("/server/listen/connect_plain", test_connect_plain);
>      g_test_add_func("/server/listen/connect_tls", test_connect_tls);
>      g_test_add_func("/server/listen/connect_both", test_connect_plain_and_tls);
> +#ifndef _WIN32
>      g_test_add_func("/server/listen/connect_unix", test_connect_unix);
> +#endif
>      g_test_add_func("/server/listen/connect_ko", test_connect_ko);
>
>      return g_test_run();
> --
> 2.17.2
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel



--
Marc-André Lureau


More information about the Spice-devel mailing list