| Message ID | 20200909184237.765-1-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On 09/09/2020 20.42, Yonggang Luo wrote: > These tests are blocking test-char to be finished. > Disable them by using variable is_win32, so we doesn't > need macro to open it. and easy recover those function > latter. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > tests/test-char.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) > > diff --git a/tests/test-char.c b/tests/test-char.c > index d35cc839bc..184ddceab8 100644 > --- a/tests/test-char.c > +++ b/tests/test-char.c > @@ -77,7 +77,6 @@ static void fe_event(void *opaque, QEMUChrEvent event) > } > } > > -#ifdef _WIN32 > static void char_console_test_subprocess(void) > { > QemuOpts *opts; > @@ -102,7 +101,7 @@ static void char_console_test(void) > g_test_trap_assert_passed(); > g_test_trap_assert_stdout("CONSOLE"); > } > -#endif > + > static void char_stdio_test_subprocess(void) > { > Chardev *chr; > @@ -1448,7 +1447,11 @@ static SocketAddress unixaddr = { > > int main(int argc, char **argv) > { > - bool has_ipv4, has_ipv6; > + bool has_ipv4, has_ipv6, is_win32 = false; > + > +#ifdef _WIN32 > + is_win32 = true; > +#endif > > qemu_init_main_loop(&error_abort); > socket_init(); > @@ -1467,12 +1470,15 @@ int main(int argc, char **argv) > g_test_add_func("/char/invalid", char_invalid_test); > g_test_add_func("/char/ringbuf", char_ringbuf_test); > g_test_add_func("/char/mux", char_mux_test); > -#ifdef _WIN32 > - g_test_add_func("/char/console/subprocess", char_console_test_subprocess); > - g_test_add_func("/char/console", char_console_test); > -#endif > - g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); > - g_test_add_func("/char/stdio", char_stdio_test); > + if (0) { > + g_test_add_func("/char/console/subprocess", char_console_test_subprocess); > + g_test_add_func("/char/console", char_console_test); > + } Sorry, but this looks pretty much like a work-in-progress debugging patch. Please avoid sending such stuff to the mailing list, and if so, clearly mark it as an RFC and describe it in the patch description. It also does not help much if you send your series three times a day to the list - nobody has that much reviewing band width. So please take some time, finish your patches first, and when you're sure that they are really finished, then post a new series to the mailing list. Thanks, Thomas > + if (!is_win32) { > + g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); > + g_test_add_func("/char/stdio", char_stdio_test); > + } > #ifndef _WIN32 > g_test_add_func("/char/pipe", char_pipe_test); > #endif > @@ -1534,7 +1540,7 @@ int main(int argc, char **argv) > g_test_add_data_func("/char/socket/client/dupid-reconnect/" # name, \ > &client8 ##name, char_socket_client_dupid_test) > > - if (has_ipv4) { > + if (has_ipv4 && !is_win32) { > SOCKET_SERVER_TEST(tcp, &tcpaddr); > SOCKET_CLIENT_TEST(tcp, &tcpaddr); > g_test_add_data_func("/char/socket/server/two-clients/tcp", &tcpaddr, >
On Thu, Sep 10, 2020 at 2:48 AM Thomas Huth <thuth@redhat.com> wrote: > On 09/09/2020 20.42, Yonggang Luo wrote: > > These tests are blocking test-char to be finished. > > Disable them by using variable is_win32, so we doesn't > > need macro to open it. and easy recover those function > > latter. > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > > --- > > tests/test-char.c | 26 ++++++++++++++++---------- > > 1 file changed, 16 insertions(+), 10 deletions(-) > > > > diff --git a/tests/test-char.c b/tests/test-char.c > > index d35cc839bc..184ddceab8 100644 > > --- a/tests/test-char.c > > +++ b/tests/test-char.c > > @@ -77,7 +77,6 @@ static void fe_event(void *opaque, QEMUChrEvent event) > > } > > } > > > > -#ifdef _WIN32 > > static void char_console_test_subprocess(void) > > { > > QemuOpts *opts; > > @@ -102,7 +101,7 @@ static void char_console_test(void) > > g_test_trap_assert_passed(); > > g_test_trap_assert_stdout("CONSOLE"); > > } > > -#endif > > + > > static void char_stdio_test_subprocess(void) > > { > > Chardev *chr; > > @@ -1448,7 +1447,11 @@ static SocketAddress unixaddr = { > > > > int main(int argc, char **argv) > > { > > - bool has_ipv4, has_ipv6; > > + bool has_ipv4, has_ipv6, is_win32 = false; > > + > > +#ifdef _WIN32 > > + is_win32 = true; > > +#endif > > > > qemu_init_main_loop(&error_abort); > > socket_init(); > > @@ -1467,12 +1470,15 @@ int main(int argc, char **argv) > > g_test_add_func("/char/invalid", char_invalid_test); > > g_test_add_func("/char/ringbuf", char_ringbuf_test); > > g_test_add_func("/char/mux", char_mux_test); > > -#ifdef _WIN32 > > - g_test_add_func("/char/console/subprocess", > char_console_test_subprocess); > > - g_test_add_func("/char/console", char_console_test); > > -#endif > > - g_test_add_func("/char/stdio/subprocess", > char_stdio_test_subprocess); > > - g_test_add_func("/char/stdio", char_stdio_test); > > + if (0) { > > + g_test_add_func("/char/console/subprocess", > char_console_test_subprocess); > > + g_test_add_func("/char/console", char_console_test); > > + } > > Sorry, but this looks pretty much like a work-in-progress debugging > patch. Please avoid sending such stuff to the mailing list, and if so, > clearly mark it as an RFC and describe it in the patch description. > > It also does not help much if you send your series three times a day to > the list - nobody has that much reviewing band width. So please take > some time, finish your patches first, and when you're sure that they are > really finished, then post a new series to the mailing list. > Sorry for that, test-char is hard to fix and I can not fixes in my own, so I need help from community, For all other patches I am confident, but for this, I am asking for help, I'd like to know who is familiar with char and I'd like to talk with them privately if possible. > > Thanks, > Thomas > > > > + if (!is_win32) { > > + g_test_add_func("/char/stdio/subprocess", > char_stdio_test_subprocess); > > + g_test_add_func("/char/stdio", char_stdio_test); > > + } > > #ifndef _WIN32 > > g_test_add_func("/char/pipe", char_pipe_test); > > #endif > > @@ -1534,7 +1540,7 @@ int main(int argc, char **argv) > > g_test_add_data_func("/char/socket/client/dupid-reconnect/" # name, > \ > > &client8 ##name, char_socket_client_dupid_test) > > > > - if (has_ipv4) { > > + if (has_ipv4 && !is_win32) { > > SOCKET_SERVER_TEST(tcp, &tcpaddr); > > SOCKET_CLIENT_TEST(tcp, &tcpaddr); > > g_test_add_data_func("/char/socket/server/two-clients/tcp", > &tcpaddr, > > > >
diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..184ddceab8 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -77,7 +77,6 @@ static void fe_event(void *opaque, QEMUChrEvent event) } } -#ifdef _WIN32 static void char_console_test_subprocess(void) { QemuOpts *opts; @@ -102,7 +101,7 @@ static void char_console_test(void) g_test_trap_assert_passed(); g_test_trap_assert_stdout("CONSOLE"); } -#endif + static void char_stdio_test_subprocess(void) { Chardev *chr; @@ -1448,7 +1447,11 @@ static SocketAddress unixaddr = { int main(int argc, char **argv) { - bool has_ipv4, has_ipv6; + bool has_ipv4, has_ipv6, is_win32 = false; + +#ifdef _WIN32 + is_win32 = true; +#endif qemu_init_main_loop(&error_abort); socket_init(); @@ -1467,12 +1470,15 @@ int main(int argc, char **argv) g_test_add_func("/char/invalid", char_invalid_test); g_test_add_func("/char/ringbuf", char_ringbuf_test); g_test_add_func("/char/mux", char_mux_test); -#ifdef _WIN32 - g_test_add_func("/char/console/subprocess", char_console_test_subprocess); - g_test_add_func("/char/console", char_console_test); -#endif - g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); - g_test_add_func("/char/stdio", char_stdio_test); + if (0) { + g_test_add_func("/char/console/subprocess", char_console_test_subprocess); + g_test_add_func("/char/console", char_console_test); + } + + if (!is_win32) { + g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); + g_test_add_func("/char/stdio", char_stdio_test); + } #ifndef _WIN32 g_test_add_func("/char/pipe", char_pipe_test); #endif @@ -1534,7 +1540,7 @@ int main(int argc, char **argv) g_test_add_data_func("/char/socket/client/dupid-reconnect/" # name, \ &client8 ##name, char_socket_client_dupid_test) - if (has_ipv4) { + if (has_ipv4 && !is_win32) { SOCKET_SERVER_TEST(tcp, &tcpaddr); SOCKET_CLIENT_TEST(tcp, &tcpaddr); g_test_add_data_func("/char/socket/server/two-clients/tcp", &tcpaddr,
These tests are blocking test-char to be finished. Disable them by using variable is_win32, so we doesn't need macro to open it. and easy recover those function latter. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- tests/test-char.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)