tests/qtest: migration-test: Enable TLS PSK tests for win32
PATCH 1/1 tests/qtest: migration-test: Enable TLS PSK tests for win32
Since commit f1018ea0a30f ("tests: avoid DOS line endings in PSK file"), the bug of the helper test_tls_psk_init_common() that caused TLS PSK tests to fail on Windows was fixed. Let's enable these tests on win32.
Signed-off-by Bin Meng <[email protected]>
---
tests/qtest/migration-test.c | 14 -------------- 1 file changed, 14 deletions(-)
tests/qtest/migration-test.c +0 -14
@@ -1402,7 +1402,6 @@ static void test_precopy_unix_dirty_ring(void) }#ifdef CONFIG_GNUTLS -#ifndef _WIN32static void test_precopy_unix_tls_psk (void ) { g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
@@ -1415,7 +1414,6 @@ static void test_precopy_unix_tls_psk(void)test_precopy_common (&args); } -#endif /* _WIN32 */ #ifdef CONFIG_TASN1 static void test_precopy_unix_tls_x509_default_host (void )
@@ -1524,7 +1522,6 @@ static void test_precopy_tcp_plain(void) } #ifdef CONFIG_GNUTLS -#ifndef _WIN32 static void test_precopy_tcp_tls_psk_match(void) { MigrateCommon args = {
@@ -1535,7 +1532,6 @@ static void test_precopy_tcp_tls_psk_match(void)test_precopy_common (&args); } -#endif /* _WIN32 */ static void test_precopy_tcp_tls_psk_mismatch (void ) {
@@ -1933,7 +1929,6 @@ static void test_multifd_tcp_zstd(void)#endif #ifdef CONFIG_GNUTLS -#ifndef _WIN32static void *test_migrate_multifd_tcp_tls_psk_start_match (QTestState *from,QTestState *to)
@@ -1941,7 +1936,6 @@ test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from,test_migrate_precopy_tcp_multifd_start_common (from, to,"none" );return test_migrate_tls_psk_start_match (from, to); } -#endif /* _WIN32 */ static void * test_migrate_multifd_tcp_tls_psk_start_mismatch(QTestState *from,
@@ -1993,7 +1987,6 @@ test_migrate_multifd_tls_x509_start_reject_anon_client(QTestState *from, }#endif /* CONFIG_TASN1 */ -#ifndef _WIN32static void test_multifd_tcp_tls_psk_match (void ) {MigrateCommon args = {
@@ -2003,7 +1996,6 @@ static void test_multifd_tcp_tls_psk_match(void) };test_precopy_common (&args); } -#endif /* _WIN32 */ static void test_multifd_tcp_tls_psk_mismatch (void ) {
@@ -2505,10 +2497,8 @@ int main(int argc, char **argv)qtest_add_func ("/migration/precopy/unix/plain" , test_precopy_unix_plain);qtest_add_func ("/migration/precopy/unix/xbzrle" , test_precopy_unix_xbzrle);#ifdef CONFIG_GNUTLS -#ifndef _WIN32qtest_add_func ("/migration/precopy/unix/tls/psk" , test_precopy_unix_tls_psk); -#endif if (has_uffd) {/*
@@ -2534,10 +2524,8 @@ int main(int argc, char **argv)qtest_add_func ("/migration/precopy/tcp/plain" , test_precopy_tcp_plain);#ifdef CONFIG_GNUTLS -#ifndef _WIN32qtest_add_func ("/migration/precopy/tcp/tls/psk/match" , test_precopy_tcp_tls_psk_match); -#endif qtest_add_func ("/migration/precopy/tcp/tls/psk/mismatch" , test_precopy_tcp_tls_psk_mismatch);#ifdef CONFIG_TASN1
@@ -2581,10 +2569,8 @@ int main(int argc, char **argv) test_multifd_tcp_zstd);#endif #ifdef CONFIG_GNUTLS -#ifndef _WIN32qtest_add_func ("/migration/multifd/tcp/tls/psk/match" , test_multifd_tcp_tls_psk_match); -#endif qtest_add_func ("/migration/multifd/tcp/tls/psk/mismatch" , test_multifd_tcp_tls_psk_mismatch);#ifdef CONFIG_TASN1
Signature · 1 line
2.25.1