[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/24] tests: fix test-util-sockets.c
From: |
Thomas Huth |
Subject: |
[PULL 21/24] tests: fix test-util-sockets.c |
Date: |
Wed, 16 Sep 2020 13:47:28 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
Fixes following errors:
Running test test-util-sockets
ERROR test-util-sockets - missing test plan
# Start of name tests
**
ERROR:../tests/test-util-sockets.c:93:test_socket_fd_pass_name_good: assertion
failed (fd != -1): (-1 != -1)
Bail out! ERROR:../tests/test-util-sockets.c:93:test_socket_fd_pass_name_good:
assertion failed (fd != -1): (-1 != -1)
First should call to qemu_init_main_loop before socket_init,
then on win32 doesn't support for SOCKET_ADDRESS_TYPE_FD socket type
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200915121318.247-21-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/test-util-sockets.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index af9f5c0c70..1bbb16d9b1 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -75,7 +75,7 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_list
ap) { abort(); }
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) {}
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) {}
-
+#ifndef _WIN32
static void test_socket_fd_pass_name_good(void)
{
SocketAddress addr;
@@ -227,6 +227,7 @@ static void test_socket_fd_pass_num_nocli(void)
g_free(addr.u.fd.str);
}
+#endif
#ifdef __linux__
static gchar *abstract_sock_name;
@@ -321,6 +322,7 @@ int main(int argc, char **argv)
{
bool has_ipv4, has_ipv6;
+ qemu_init_main_loop(&error_abort);
socket_init();
g_test_init(&argc, &argv, NULL);
@@ -340,6 +342,7 @@ int main(int argc, char **argv)
test_fd_is_socket_bad);
g_test_add_func("/util/socket/is-socket/good",
test_fd_is_socket_good);
+#ifndef _WIN32
g_test_add_func("/socket/fd-pass/name/good",
test_socket_fd_pass_name_good);
g_test_add_func("/socket/fd-pass/name/bad",
@@ -352,6 +355,7 @@ int main(int argc, char **argv)
test_socket_fd_pass_num_bad);
g_test_add_func("/socket/fd-pass/num/nocli",
test_socket_fd_pass_num_nocli);
+#endif
}
#ifdef __linux__
--
2.18.2
- [PULL 12/24] tests: Fixes test-replication.c on msys2/mingw., (continued)
- [PULL 12/24] tests: Fixes test-replication.c on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 14/24] osdep: file locking functions are not available on Win32, Thomas Huth, 2020/09/16
- [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Thomas Huth, 2020/09/16
- [PULL 13/24] tests: test-replication disable /replication/secondary/* on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 16/24] meson: remove empty else and duplicated gio deps, Thomas Huth, 2020/09/16
- [PULL 17/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 19/24] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c, Thomas Huth, 2020/09/16
- [PULL 18/24] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits, Thomas Huth, 2020/09/16
- [PULL 22/24] tests: Fixes test-qdev-global-props.c, Thomas Huth, 2020/09/16
- [PULL 21/24] tests: fix test-util-sockets.c,
Thomas Huth <=
- [PULL 23/24] ci: Enable msys2 ci in cirrus, Thomas Huth, 2020/09/16
- [PULL 24/24] cirrus: Building freebsd in a single shot, Thomas Huth, 2020/09/16
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17
- Re: [PULL 00/24] qtests, unit tests and Cirrus-CI fixes / improvements, Peter Maydell, 2020/09/17