tests/qtest: migration-test: Skip running test_migrate_fd_proto on win32
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> Message-Id: <20220824094029.1634519-22-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
8b1525b702
commit
d7613ee216
|
@ -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.
|
* 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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Events can get in the way of responses we are actually waiting for.
|
* Events can get in the way of responses we are actually waiting for.
|
||||||
|
|
|
@ -17,8 +17,10 @@
|
||||||
|
|
||||||
extern bool got_stop;
|
extern bool got_stop;
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
G_GNUC_PRINTF(3, 4)
|
G_GNUC_PRINTF(3, 4)
|
||||||
QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...);
|
QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...);
|
||||||
|
#endif
|
||||||
|
|
||||||
G_GNUC_PRINTF(2, 3)
|
G_GNUC_PRINTF(2, 3)
|
||||||
QDict *wait_command(QTestState *who, const char *command, ...);
|
QDict *wait_command(QTestState *who, const char *command, ...);
|
||||||
|
|
|
@ -1631,6 +1631,7 @@ static void test_precopy_tcp_tls_x509_reject_anon_client(void)
|
||||||
#endif /* CONFIG_TASN1 */
|
#endif /* CONFIG_TASN1 */
|
||||||
#endif /* CONFIG_GNUTLS */
|
#endif /* CONFIG_GNUTLS */
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
static void *test_migrate_fd_start_hook(QTestState *from,
|
static void *test_migrate_fd_start_hook(QTestState *from,
|
||||||
QTestState *to)
|
QTestState *to)
|
||||||
{
|
{
|
||||||
|
@ -1699,6 +1700,7 @@ static void test_migrate_fd_proto(void)
|
||||||
};
|
};
|
||||||
test_precopy_common(&args);
|
test_precopy_common(&args);
|
||||||
}
|
}
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
static void do_test_validate_uuid(MigrateStart *args, bool should_fail)
|
static void do_test_validate_uuid(MigrateStart *args, bool should_fail)
|
||||||
{
|
{
|
||||||
|
@ -2531,7 +2533,9 @@ int main(int argc, char **argv)
|
||||||
#endif /* CONFIG_GNUTLS */
|
#endif /* CONFIG_GNUTLS */
|
||||||
|
|
||||||
/* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
|
/* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
|
||||||
|
#ifndef _WIN32
|
||||||
qtest_add_func("/migration/fd_proto", test_migrate_fd_proto);
|
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", test_validate_uuid);
|
||||||
qtest_add_func("/migration/validate_uuid_error", test_validate_uuid_error);
|
qtest_add_func("/migration/validate_uuid_error", test_validate_uuid_error);
|
||||||
qtest_add_func("/migration/validate_uuid_src_not_set",
|
qtest_add_func("/migration/validate_uuid_src_not_set",
|
||||||
|
|
Loading…
Reference in New Issue