[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] test: skip tests if socket_check_protocol_suppor
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 6/6] test: skip tests if socket_check_protocol_support() failed |
Date: |
Thu, 22 Aug 2019 17:47:25 +0400 |
Skip the tests if socket_check_protocol_support() failed, but do run
g_test_run() to keep TAP harness happy.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
tests/test-char.c | 4 +++-
tests/test-io-channel-socket.c | 4 +++-
tests/test-util-sockets.c | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/tests/test-char.c b/tests/test-char.c
index 2dde620afc..b56e43c1eb 100644
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -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();
}
diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index d2053c464c..d172f3070f 100644
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -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();
}
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index f1ebffee5a..e2a3a8a093 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -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();
}
--
2.23.0
- [Qemu-devel] [PULL 0/6] Podman patches, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 1/6] docker.py: add --run-as-current-user, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 3/6] tests/docker: add podman support, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 2/6] docker.py: add podman support, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 4/6] tests: specify the address family when checking bind, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 5/6] test-char: skip tcp tests if ipv4 check failed, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 6/6] test: skip tests if socket_check_protocol_support() failed,
Marc-André Lureau <=
- Re: [Qemu-devel] [PULL 0/6] Podman patches, Peter Maydell, 2019/08/23