| Message ID | 20220824094029.1634519-22-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
* Bin Meng (bmeng.cn@gmail.com) wrote: > From: Bin Meng <bin.meng@windriver.com> > > The test case 'test_migrate_fd_proto' calls socketpair() which does > not exist on win32. Exclude it. The helper function wait_command_fd() > is not needed anymore, hence exclude it too. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > > tests/qtest/migration-helpers.h | 2 ++ > tests/qtest/migration-helpers.c | 2 ++ > tests/qtest/migration-test.c | 4 ++++ > 3 files changed, 8 insertions(+) > > diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h > index 59561898d0..db0684de48 100644 > --- a/tests/qtest/migration-helpers.h > +++ b/tests/qtest/migration-helpers.h > @@ -17,8 +17,10 @@ > > extern bool got_stop; > > +#ifndef _WIN32 > G_GNUC_PRINTF(3, 4) > QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...); > +#endif > > G_GNUC_PRINTF(2, 3) > QDict *wait_command(QTestState *who, const char *command, ...); > diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c > index c6fbeb3974..f6f3c6680f 100644 > --- a/tests/qtest/migration-helpers.c > +++ b/tests/qtest/migration-helpers.c > @@ -34,6 +34,7 @@ static void check_stop_event(QTestState *who) > } > } > > +#ifndef _WIN32 > /* > * Events can get in the way of responses we are actually waiting for. > */ > @@ -58,6 +59,7 @@ QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...) > > return ret; > } > +#endif > > /* > * Events can get in the way of responses we are actually waiting for. > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index af9250750b..2ae7498d5d 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1629,6 +1629,7 @@ static void test_precopy_tcp_tls_x509_reject_anon_client(void) > #endif /* CONFIG_TASN1 */ > #endif /* CONFIG_GNUTLS */ > > +#ifndef _WIN32 > static void *test_migrate_fd_start_hook(QTestState *from, > QTestState *to) > { > @@ -1697,6 +1698,7 @@ static void test_migrate_fd_proto(void) > }; > test_precopy_common(&args); > } > +#endif /* _WIN32 */ > > static void do_test_validate_uuid(MigrateStart *args, bool should_fail) > { > @@ -2531,7 +2533,9 @@ int main(int argc, char **argv) > #endif /* CONFIG_GNUTLS */ > > /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */ > +#ifndef _WIN32 > qtest_add_func("/migration/fd_proto", test_migrate_fd_proto); > +#endif > qtest_add_func("/migration/validate_uuid", test_validate_uuid); > qtest_add_func("/migration/validate_uuid_error", test_validate_uuid_error); > qtest_add_func("/migration/validate_uuid_src_not_set", > -- > 2.34.1 >
On 24/8/22 11:39, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > The test case 'test_migrate_fd_proto' calls socketpair() which does > not exist on win32. Exclude it. The helper function wait_command_fd() > is not needed anymore, hence exclude it too. I'd rather use a feature test, then check for the HAVE_POSIX_SOCKETPAIR definition. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > tests/qtest/migration-helpers.h | 2 ++ > tests/qtest/migration-helpers.c | 2 ++ > tests/qtest/migration-test.c | 4 ++++ > 3 files changed, 8 insertions(+)
diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h index 59561898d0..db0684de48 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -17,8 +17,10 @@ extern bool got_stop; +#ifndef _WIN32 G_GNUC_PRINTF(3, 4) QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...); +#endif G_GNUC_PRINTF(2, 3) QDict *wait_command(QTestState *who, const char *command, ...); diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c index c6fbeb3974..f6f3c6680f 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -34,6 +34,7 @@ static void check_stop_event(QTestState *who) } } +#ifndef _WIN32 /* * Events can get in the way of responses we are actually waiting for. */ @@ -58,6 +59,7 @@ QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...) return ret; } +#endif /* * Events can get in the way of responses we are actually waiting for. diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index af9250750b..2ae7498d5d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1629,6 +1629,7 @@ static void test_precopy_tcp_tls_x509_reject_anon_client(void) #endif /* CONFIG_TASN1 */ #endif /* CONFIG_GNUTLS */ +#ifndef _WIN32 static void *test_migrate_fd_start_hook(QTestState *from, QTestState *to) { @@ -1697,6 +1698,7 @@ static void test_migrate_fd_proto(void) }; test_precopy_common(&args); } +#endif /* _WIN32 */ static void do_test_validate_uuid(MigrateStart *args, bool should_fail) { @@ -2531,7 +2533,9 @@ int main(int argc, char **argv) #endif /* CONFIG_GNUTLS */ /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */ +#ifndef _WIN32 qtest_add_func("/migration/fd_proto", test_migrate_fd_proto); +#endif qtest_add_func("/migration/validate_uuid", test_validate_uuid); qtest_add_func("/migration/validate_uuid_error", test_validate_uuid_error); qtest_add_func("/migration/validate_uuid_src_not_set",