| Message ID | 20200908194820.702-6-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 patches | expand |
On 08/09/2020 21.48, Yonggang Luo wrote: > These tests are blocking test-char to be finished. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > tests/test-char.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tests/test-char.c b/tests/test-char.c > index d35cc839bc..80e5bac61a 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,8 +1473,10 @@ 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); > +#endif > #ifndef _WIN32 > g_test_add_func("/char/pipe", char_pipe_test); > #endif I think you could rather simply replace the three #ifndef _WIN32 sections with only one? Thomas
On Wed, Sep 9, 2020 at 3:13 PM Thomas Huth <thuth@redhat.com> wrote: > On 08/09/2020 21.48, Yonggang Luo wrote: > > These tests are blocking test-char to be finished. > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > > --- > > tests/test-char.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/tests/test-char.c b/tests/test-char.c > > index d35cc839bc..80e5bac61a 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,8 +1473,10 @@ 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); > > +#endif > > #ifndef _WIN32 > > g_test_add_func("/char/pipe", char_pipe_test); > > #endif > > I think you could rather simply replace the three #ifndef _WIN32 > sections with only one? > That's easy, I am wondering if /char/stdio are able works under win32? And also the /char/pipe, anyway disable it first, trying it latter > > Thomas > >
diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..80e5bac61a 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,8 +1473,10 @@ 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); +#endif #ifndef _WIN32 g_test_add_func("/char/pipe", char_pipe_test); #endif
These tests are blocking test-char to be finished. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- tests/test-char.c | 4 ++++ 1 file changed, 4 insertions(+)