| Message ID | 20200909184237.765-1-luoyonggang@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
Il mer 9 set 2020, 20:43 Yonggang Luo <luoyonggang@gmail.com> ha scritto: > So we can removal usage of unstable-keyval > Isn't it stable only on 0.56.0? Paolo > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > meson.build | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/meson.build b/meson.build > index 0b1741557d..af34a85bec 100644 > --- a/meson.build > +++ b/meson.build > @@ -1,14 +1,11 @@ > -project('qemu', ['c'], meson_version: '>=0.55.0', > +project('qemu', ['c'], meson_version: '>=0.55.1', > default_options: ['warning_level=1', 'c_std=gnu99', > 'cpp_std=gnu++11', > 'b_colorout=auto'], > version: run_command('head', meson.source_root() / > 'VERSION').stdout().strip()) > > not_found = dependency('', required: false) > -if meson.version().version_compare('>=0.56.0') > - keyval = import('keyval') > -else > - keyval = import('unstable-keyval') > -endif > +keyval = import('keyval') > + > ss = import('sourceset') > > sh = find_program('sh') > -- > 2.28.0.windows.1 > > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il mer 9 set 2020, 20:43 Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">So we can removal usage of unstable-keyval<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Isn't it stable only on 0.56.0?</div><div dir="auto"><br></div><div dir="auto">Paolo</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Signed-off-by: Yonggang Luo <<a href="mailto:luoyonggang@gmail.com" target="_blank" rel="noreferrer">luoyonggang@gmail.com</a>><br> ---<br> meson.build | 9 +++------<br> 1 file changed, 3 insertions(+), 6 deletions(-)<br> <br> diff --git a/meson.build b/meson.build<br> index 0b1741557d..af34a85bec 100644<br> --- a/meson.build<br> +++ b/meson.build<br> @@ -1,14 +1,11 @@<br> -project('qemu', ['c'], meson_version: '>=0.55.0',<br> +project('qemu', ['c'], meson_version: '>=0.55.1',<br> default_options: ['warning_level=1', 'c_std=gnu99', 'cpp_std=gnu++11',<br> 'b_colorout=auto'],<br> version: run_command('head', meson.source_root() / 'VERSION').stdout().strip())<br> <br> not_found = dependency('', required: false)<br> -if meson.version().version_compare('>=0.56.0')<br> - keyval = import('keyval')<br> -else<br> - keyval = import('unstable-keyval')<br> -endif<br> +keyval = import('keyval')<br> +<br> ss = import('sourceset')<br> <br> sh = find_program('sh')<br> -- <br> 2.28.0.windows.1<br> <br> </blockquote></div></div></div>
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(-)