| Message ID | 20200909094617.1582-6-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
On Wed, Sep 09, 2020 at 05:46:01PM +0800, Yonggang Luo wrote: > These tests are blocking test-char to be finished. > Merge three #ifndef _WIN32 > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > tests/test-char.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
On Wed, Sep 9, 2020 at 8:52 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > On Wed, Sep 09, 2020 at 05:46:01PM +0800, Yonggang Luo wrote: > > These tests are blocking test-char to be finished. > > Merge three #ifndef _WIN32 > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > > --- > > tests/test-char.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > Regards, > Daniel > https://cirrus-ci.com/task/6266195793936384?command=main#L433 test-char still failing randomly. I'd like to disable more to make sure it's not failing ERROR:../tests/test-char.c:103:char_console_test: stdout of child process (/char/console/subprocess) failed to match: CONSOLE stdout was: ERROR test-char - Bail out! ERROR:../tests/test-char.c:103:char_console_test: stdout of child process (/char/console/subprocess) failed to match: CONSOLE make: *** [Makefile.mtest:576: run-test-80] Error 1 C:\Users\ContainerAdministrator\AppData\Local\Temp\cirrus-ci-build>if 2 NEQ 0 exit /b 2 > -- > |: https://berrange.com -o- > https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- > https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- > https://www.instagram.com/dberrange :| > >
diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..ab037647bf 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -103,6 +103,7 @@ static void char_console_test(void) g_test_trap_assert_stdout("CONSOLE"); } #endif +#ifndef _WIN32 static void char_stdio_test_subprocess(void) { Chardev *chr; @@ -126,6 +127,7 @@ static void char_stdio_test(void) g_test_trap_assert_passed(); g_test_trap_assert_stdout("buf"); } +#endif static void char_ringbuf_test(void) { @@ -1471,15 +1473,13 @@ int main(int argc, char **argv) g_test_add_func("/char/console/subprocess", char_console_test_subprocess); g_test_add_func("/char/console", char_console_test); #endif +#ifndef _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 - g_test_add_func("/char/file", char_file_test); -#ifndef _WIN32 g_test_add_func("/char/file-fifo", char_file_fifo_test); #endif + g_test_add_func("/char/file", char_file_test); #define SOCKET_SERVER_TEST(name, addr) \ static CharSocketServerTestConfig server1 ## name = \
These tests are blocking test-char to be finished. Merge three #ifndef _WIN32 Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- tests/test-char.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)