From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Ed Maste <emaste@freebsd.org>,
Michael Roth <mdroth@linux.vnet.ibm.com>,
qemu-block@nongnu.org, Stefan Weil <sw@weilnetz.de>,
Xie Changlong <xiechanglong.d@gmail.com>,
Peter Lieven <pl@kamp.de>, Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Wen Congyang <wencongyang2@huawei.com>,
Richard Henderson <richard.henderson@linaro.org>,
Li-Wen Hsu <lwhsu@freebsd.org>
Subject: [PATCH v2 20/21] tests: fix test-util-sockets.c
Date: Wed, 9 Sep 2020 17:46:16 +0800 [thread overview]
Message-ID: <20200909094617.1582-21-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200909094617.1582-1-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>
---
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.28.0.windows.1
next prev parent reply other threads:[~2020-09-09 10:00 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 9:45 [PATCH v2 00/21] W32, W64 msys2/mingw patches Yonggang Luo
2020-09-09 9:45 ` [PATCH v2 01/21] block: Fixes nfs compiling error on msys2/mingw Yonggang Luo
2020-09-09 12:24 ` Daniel P. Berrangé
2020-09-10 7:01 ` Peter Lieven
2020-09-10 7:14 ` 罗勇刚(Yonggang Luo)
2020-09-10 7:29 ` Peter Lieven
2020-09-10 9:02 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:45 ` [PATCH v2 02/21] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-09 12:26 ` Daniel P. Berrangé
2020-09-09 15:27 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:45 ` [PATCH v2 03/21] configure: Fixes ncursesw detection under msys2/mingw and enable curses Yonggang Luo
2020-09-09 12:50 ` Daniel P. Berrangé
2020-09-09 12:55 ` 罗勇刚(Yonggang Luo)
2020-09-09 13:22 ` Daniel P. Berrangé
2020-10-02 17:49 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 04/21] curses: Fixes curses compiling errors Yonggang Luo
2020-09-09 12:51 ` Daniel P. Berrangé
2020-09-09 13:26 ` Peter Maydell
2020-09-09 15:58 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 05/21] tests: disable /char/stdio/* tests in test-char.c on win32 Yonggang Luo
2020-09-09 12:52 ` Daniel P. Berrangé
2020-09-09 18:10 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 06/21] ci: Enable msys2 ci in cirrus Yonggang Luo
2020-09-09 12:53 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 07/21] tests: Trying fixes test-replication.c on msys2/mingw Yonggang Luo
2020-09-09 12:55 ` Daniel P. Berrangé
2020-09-09 12:59 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 08/21] tests: test-replication disable /replication/secondary/* " Yonggang Luo
2020-09-09 12:58 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 09/21] osdep: These function are only available on Non-Win32 system Yonggang Luo
2020-09-09 12:59 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 10/21] meson: Use -b to ignore CR vs. CR-LF issues on Windows Yonggang Luo
2020-09-09 12:59 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 11/21] meson: disable crypto tests are empty under win32 Yonggang Luo
2020-09-09 13:00 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 12/21] meson: remove empty else and duplicated gio deps Yonggang Luo
2020-09-09 13:00 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 13/21] vmstate: Fixes test-vmstate.c on msys2/mingw Yonggang Luo
2020-09-09 13:05 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 14/21] cirrus: Building freebsd in a single short Yonggang Luo
2020-09-09 17:32 ` Ed Maste
2020-09-09 18:16 ` Daniel P. Berrangé
2020-09-09 18:28 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 15/21] tests: Convert g_free to g_autofree macro in test-logging.c Yonggang Luo
2020-09-09 13:08 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 16/21] rcu: add uninit destructor for rcu Yonggang Luo
2020-09-09 9:46 ` [PATCH v2 17/21] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Yonggang Luo
2020-09-09 13:08 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 18/21] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Yonggang Luo
2020-09-09 9:46 ` [PATCH v2 19/21] tests: Fixes test-io-channel-file by mask only owner file state mask bits Yonggang Luo
2020-09-09 13:10 ` Daniel P. Berrangé
2020-09-09 9:46 ` Yonggang Luo [this message]
2020-09-09 13:11 ` [PATCH v2 20/21] tests: fix test-util-sockets.c Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 21/21] tests: Fixes test-qdev-global-props.c Yonggang Luo
2020-09-09 13:18 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200909094617.1582-21-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=armbru@redhat.com \
--cc=emaste@freebsd.org \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).