Commit a4eb74a6 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

test: skip tests if socket_check_protocol_support() failed 



Skip the tests if socket_check_protocol_support() failed, but do run
g_test_run() to keep TAP harness happy.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent e7b6ba41

tests/test-char.c

+3 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,8 @@ int main(int argc, char **argv) 
    g_test_init(&argc, &argv, NULL);



    if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) {

        return -1;

        g_printerr("socket_check_protocol_support() failed\n");

        goto end;

    }



    module_call_init(MODULE_INIT_QOM);
@@ -1465,5 +1466,6 @@ int main(int argc, char **argv) 
    g_test_add_func("/char/hotswap", char_hotswap_test);

    g_test_add_func("/char/websocket", char_websock_test);



end:

    return g_test_run();

}

tests/test-io-channel-socket.c

+3 −1
Original line number Diff line number Diff line
@@ -566,7 +566,8 @@ int main(int argc, char **argv) 
     * with either IPv4 or IPv6 disabled.

     */

    if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) {

        return 1;

        g_printerr("socket_check_protocol_support() failed\n");

        goto end;

    }



    if (has_ipv4) {
@@ -595,5 +596,6 @@ int main(int argc, char **argv) 
                    test_io_channel_unix_listen_cleanup);

#endif /* _WIN32 */



end:

    return g_test_run();

}

tests/test-util-sockets.c

+3 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ int main(int argc, char **argv) 
     * with either IPv4 or IPv6 disabled.

     */

    if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) {

        return 1;

        g_printerr("socket_check_protocol_support() failed\n");

        goto end;

    }



    if (has_ipv4) {
@@ -264,5 +265,6 @@ int main(int argc, char **argv) 
                        test_socket_fd_pass_num_nocli);

    }



end:

    return g_test_run();

}