From: peterx@redhat.com
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: peterx@redhat.com, Fabiano Rosas <farosas@suse.de>
Subject: [PULL 08/20] tests/qtest/migration: Use the new migration_test_add
Date: Tue, 16 Jan 2024 11:19:35 +0800 [thread overview]
Message-ID: <20240116031947.69017-9-peterx@redhat.com> (raw)
In-Reply-To: <20240116031947.69017-1-peterx@redhat.com>
From: Fabiano Rosas <farosas@suse.de>
Replace the tests registration with the new function that prints tests
names.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240104142144.9680-8-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qtest/migration-test.c | 215 ++++++++++++++++++-----------------
1 file changed, 112 insertions(+), 103 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 136e5df06c..21da140aea 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -3404,70 +3404,75 @@ int main(int argc, char **argv)
module_call_init(MODULE_INIT_QOM);
if (is_x86) {
- qtest_add_func("/migration/precopy/unix/suspend/live",
- test_precopy_unix_suspend_live);
- qtest_add_func("/migration/precopy/unix/suspend/notlive",
- test_precopy_unix_suspend_notlive);
+ migration_test_add("/migration/precopy/unix/suspend/live",
+ test_precopy_unix_suspend_live);
+ migration_test_add("/migration/precopy/unix/suspend/notlive",
+ test_precopy_unix_suspend_notlive);
}
if (has_uffd) {
- qtest_add_func("/migration/postcopy/plain", test_postcopy);
- qtest_add_func("/migration/postcopy/recovery/plain",
- test_postcopy_recovery);
- qtest_add_func("/migration/postcopy/preempt/plain", test_postcopy_preempt);
- qtest_add_func("/migration/postcopy/preempt/recovery/plain",
- test_postcopy_preempt_recovery);
+ migration_test_add("/migration/postcopy/plain", test_postcopy);
+ migration_test_add("/migration/postcopy/recovery/plain",
+ test_postcopy_recovery);
+ migration_test_add("/migration/postcopy/preempt/plain",
+ test_postcopy_preempt);
+ migration_test_add("/migration/postcopy/preempt/recovery/plain",
+ test_postcopy_preempt_recovery);
if (getenv("QEMU_TEST_FLAKY_TESTS")) {
- qtest_add_func("/migration/postcopy/compress/plain",
- test_postcopy_compress);
- qtest_add_func("/migration/postcopy/recovery/compress/plain",
- test_postcopy_recovery_compress);
+ migration_test_add("/migration/postcopy/compress/plain",
+ test_postcopy_compress);
+ migration_test_add("/migration/postcopy/recovery/compress/plain",
+ test_postcopy_recovery_compress);
}
#ifndef _WIN32
- qtest_add_func("/migration/postcopy/recovery/double-failures",
- test_postcopy_recovery_double_fail);
+ migration_test_add("/migration/postcopy/recovery/double-failures",
+ test_postcopy_recovery_double_fail);
#endif /* _WIN32 */
if (is_x86) {
- qtest_add_func("/migration/postcopy/suspend",
- test_postcopy_suspend);
+ migration_test_add("/migration/postcopy/suspend",
+ test_postcopy_suspend);
}
}
- qtest_add_func("/migration/bad_dest", test_baddest);
+ migration_test_add("/migration/bad_dest", test_baddest);
#ifndef _WIN32
- qtest_add_func("/migration/analyze-script", test_analyze_script);
+ if (!g_str_equal(arch, "s390x")) {
+ migration_test_add("/migration/analyze-script", test_analyze_script);
+ }
#endif
- qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain);
- qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);
+ migration_test_add("/migration/precopy/unix/plain",
+ test_precopy_unix_plain);
+ migration_test_add("/migration/precopy/unix/xbzrle",
+ test_precopy_unix_xbzrle);
/*
* Compression fails from time to time.
* Put test here but don't enable it until everything is fixed.
*/
if (getenv("QEMU_TEST_FLAKY_TESTS")) {
- qtest_add_func("/migration/precopy/unix/compress/wait",
- test_precopy_unix_compress);
- qtest_add_func("/migration/precopy/unix/compress/nowait",
- test_precopy_unix_compress_nowait);
+ migration_test_add("/migration/precopy/unix/compress/wait",
+ test_precopy_unix_compress);
+ migration_test_add("/migration/precopy/unix/compress/nowait",
+ test_precopy_unix_compress_nowait);
}
- qtest_add_func("/migration/precopy/file",
- test_precopy_file);
- qtest_add_func("/migration/precopy/file/offset",
- test_precopy_file_offset);
- qtest_add_func("/migration/precopy/file/offset/bad",
- test_precopy_file_offset_bad);
+ migration_test_add("/migration/precopy/file",
+ test_precopy_file);
+ migration_test_add("/migration/precopy/file/offset",
+ test_precopy_file_offset);
+ migration_test_add("/migration/precopy/file/offset/bad",
+ test_precopy_file_offset_bad);
/*
* Our CI system has problems with shared memory.
* Don't run this test until we find a workaround.
*/
if (getenv("QEMU_TEST_FLAKY_TESTS")) {
- qtest_add_func("/migration/mode/reboot", test_mode_reboot);
+ migration_test_add("/migration/mode/reboot", test_mode_reboot);
}
#ifdef CONFIG_GNUTLS
- qtest_add_func("/migration/precopy/unix/tls/psk",
- test_precopy_unix_tls_psk);
+ migration_test_add("/migration/precopy/unix/tls/psk",
+ test_precopy_unix_tls_psk);
if (has_uffd) {
/*
@@ -3475,110 +3480,114 @@ int main(int argc, char **argv)
* channels are tested under precopy. Here what we want to test is the
* general postcopy path that has TLS channel enabled.
*/
- qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_psk);
- qtest_add_func("/migration/postcopy/recovery/tls/psk",
- test_postcopy_recovery_tls_psk);
- qtest_add_func("/migration/postcopy/preempt/tls/psk",
- test_postcopy_preempt_tls_psk);
- qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk",
- test_postcopy_preempt_all);
+ migration_test_add("/migration/postcopy/tls/psk",
+ test_postcopy_tls_psk);
+ migration_test_add("/migration/postcopy/recovery/tls/psk",
+ test_postcopy_recovery_tls_psk);
+ migration_test_add("/migration/postcopy/preempt/tls/psk",
+ test_postcopy_preempt_tls_psk);
+ migration_test_add("/migration/postcopy/preempt/recovery/tls/psk",
+ test_postcopy_preempt_all);
}
#ifdef CONFIG_TASN1
- qtest_add_func("/migration/precopy/unix/tls/x509/default-host",
- test_precopy_unix_tls_x509_default_host);
- qtest_add_func("/migration/precopy/unix/tls/x509/override-host",
- test_precopy_unix_tls_x509_override_host);
+ migration_test_add("/migration/precopy/unix/tls/x509/default-host",
+ test_precopy_unix_tls_x509_default_host);
+ migration_test_add("/migration/precopy/unix/tls/x509/override-host",
+ test_precopy_unix_tls_x509_override_host);
#endif /* CONFIG_TASN1 */
#endif /* CONFIG_GNUTLS */
- qtest_add_func("/migration/precopy/tcp/plain", test_precopy_tcp_plain);
+ migration_test_add("/migration/precopy/tcp/plain", test_precopy_tcp_plain);
- qtest_add_func("/migration/precopy/tcp/plain/switchover-ack",
- test_precopy_tcp_switchover_ack);
+ migration_test_add("/migration/precopy/tcp/plain/switchover-ack",
+ test_precopy_tcp_switchover_ack);
#ifdef CONFIG_GNUTLS
- qtest_add_func("/migration/precopy/tcp/tls/psk/match",
- test_precopy_tcp_tls_psk_match);
- qtest_add_func("/migration/precopy/tcp/tls/psk/mismatch",
- test_precopy_tcp_tls_psk_mismatch);
+ migration_test_add("/migration/precopy/tcp/tls/psk/match",
+ test_precopy_tcp_tls_psk_match);
+ migration_test_add("/migration/precopy/tcp/tls/psk/mismatch",
+ test_precopy_tcp_tls_psk_mismatch);
#ifdef CONFIG_TASN1
- qtest_add_func("/migration/precopy/tcp/tls/x509/default-host",
- test_precopy_tcp_tls_x509_default_host);
- qtest_add_func("/migration/precopy/tcp/tls/x509/override-host",
- test_precopy_tcp_tls_x509_override_host);
- qtest_add_func("/migration/precopy/tcp/tls/x509/mismatch-host",
- test_precopy_tcp_tls_x509_mismatch_host);
- qtest_add_func("/migration/precopy/tcp/tls/x509/friendly-client",
- test_precopy_tcp_tls_x509_friendly_client);
- qtest_add_func("/migration/precopy/tcp/tls/x509/hostile-client",
- test_precopy_tcp_tls_x509_hostile_client);
- qtest_add_func("/migration/precopy/tcp/tls/x509/allow-anon-client",
- test_precopy_tcp_tls_x509_allow_anon_client);
- qtest_add_func("/migration/precopy/tcp/tls/x509/reject-anon-client",
- test_precopy_tcp_tls_x509_reject_anon_client);
+ migration_test_add("/migration/precopy/tcp/tls/x509/default-host",
+ test_precopy_tcp_tls_x509_default_host);
+ migration_test_add("/migration/precopy/tcp/tls/x509/override-host",
+ test_precopy_tcp_tls_x509_override_host);
+ migration_test_add("/migration/precopy/tcp/tls/x509/mismatch-host",
+ test_precopy_tcp_tls_x509_mismatch_host);
+ migration_test_add("/migration/precopy/tcp/tls/x509/friendly-client",
+ test_precopy_tcp_tls_x509_friendly_client);
+ migration_test_add("/migration/precopy/tcp/tls/x509/hostile-client",
+ test_precopy_tcp_tls_x509_hostile_client);
+ migration_test_add("/migration/precopy/tcp/tls/x509/allow-anon-client",
+ test_precopy_tcp_tls_x509_allow_anon_client);
+ migration_test_add("/migration/precopy/tcp/tls/x509/reject-anon-client",
+ test_precopy_tcp_tls_x509_reject_anon_client);
#endif /* CONFIG_TASN1 */
#endif /* CONFIG_GNUTLS */
- /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
+ /* migration_test_add("/migration/ignore_shared", test_ignore_shared); */
#ifndef _WIN32
- qtest_add_func("/migration/fd_proto", test_migrate_fd_proto);
+ migration_test_add("/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",
- test_validate_uuid_src_not_set);
- qtest_add_func("/migration/validate_uuid_dst_not_set",
- test_validate_uuid_dst_not_set);
+ migration_test_add("/migration/validate_uuid", test_validate_uuid);
+ migration_test_add("/migration/validate_uuid_error",
+ test_validate_uuid_error);
+ migration_test_add("/migration/validate_uuid_src_not_set",
+ test_validate_uuid_src_not_set);
+ migration_test_add("/migration/validate_uuid_dst_not_set",
+ test_validate_uuid_dst_not_set);
/*
* See explanation why this test is slow on function definition
*/
if (g_test_slow()) {
- qtest_add_func("/migration/auto_converge", test_migrate_auto_converge);
+ migration_test_add("/migration/auto_converge",
+ test_migrate_auto_converge);
if (g_str_equal(arch, "x86_64") &&
has_kvm && kvm_dirty_ring_supported()) {
- qtest_add_func("/migration/dirty_limit", test_migrate_dirty_limit);
+ migration_test_add("/migration/dirty_limit",
+ test_migrate_dirty_limit);
}
}
- qtest_add_func("/migration/multifd/tcp/plain/none",
- test_multifd_tcp_none);
+ migration_test_add("/migration/multifd/tcp/plain/none",
+ test_multifd_tcp_none);
/*
* This test is flaky and sometimes fails in CI and otherwise:
* don't run unless user opts in via environment variable.
*/
if (getenv("QEMU_TEST_FLAKY_TESTS")) {
- qtest_add_func("/migration/multifd/tcp/plain/cancel",
- test_multifd_tcp_cancel);
+ migration_test_add("/migration/multifd/tcp/plain/cancel",
+ test_multifd_tcp_cancel);
}
- qtest_add_func("/migration/multifd/tcp/plain/zlib",
- test_multifd_tcp_zlib);
+ migration_test_add("/migration/multifd/tcp/plain/zlib",
+ test_multifd_tcp_zlib);
#ifdef CONFIG_ZSTD
- qtest_add_func("/migration/multifd/tcp/plain/zstd",
- test_multifd_tcp_zstd);
+ migration_test_add("/migration/multifd/tcp/plain/zstd",
+ test_multifd_tcp_zstd);
#endif
#ifdef CONFIG_GNUTLS
- qtest_add_func("/migration/multifd/tcp/tls/psk/match",
- test_multifd_tcp_tls_psk_match);
- qtest_add_func("/migration/multifd/tcp/tls/psk/mismatch",
- test_multifd_tcp_tls_psk_mismatch);
+ migration_test_add("/migration/multifd/tcp/tls/psk/match",
+ test_multifd_tcp_tls_psk_match);
+ migration_test_add("/migration/multifd/tcp/tls/psk/mismatch",
+ test_multifd_tcp_tls_psk_mismatch);
#ifdef CONFIG_TASN1
- qtest_add_func("/migration/multifd/tcp/tls/x509/default-host",
- test_multifd_tcp_tls_x509_default_host);
- qtest_add_func("/migration/multifd/tcp/tls/x509/override-host",
- test_multifd_tcp_tls_x509_override_host);
- qtest_add_func("/migration/multifd/tcp/tls/x509/mismatch-host",
- test_multifd_tcp_tls_x509_mismatch_host);
- qtest_add_func("/migration/multifd/tcp/tls/x509/allow-anon-client",
- test_multifd_tcp_tls_x509_allow_anon_client);
- qtest_add_func("/migration/multifd/tcp/tls/x509/reject-anon-client",
- test_multifd_tcp_tls_x509_reject_anon_client);
+ migration_test_add("/migration/multifd/tcp/tls/x509/default-host",
+ test_multifd_tcp_tls_x509_default_host);
+ migration_test_add("/migration/multifd/tcp/tls/x509/override-host",
+ test_multifd_tcp_tls_x509_override_host);
+ migration_test_add("/migration/multifd/tcp/tls/x509/mismatch-host",
+ test_multifd_tcp_tls_x509_mismatch_host);
+ migration_test_add("/migration/multifd/tcp/tls/x509/allow-anon-client",
+ test_multifd_tcp_tls_x509_allow_anon_client);
+ migration_test_add("/migration/multifd/tcp/tls/x509/reject-anon-client",
+ test_multifd_tcp_tls_x509_reject_anon_client);
#endif /* CONFIG_TASN1 */
#endif /* CONFIG_GNUTLS */
if (g_str_equal(arch, "x86_64") && has_kvm && kvm_dirty_ring_supported()) {
- qtest_add_func("/migration/dirty_ring",
- test_precopy_unix_dirty_ring);
- qtest_add_func("/migration/vcpu_dirty_limit",
- test_vcpu_dirty_limit);
+ migration_test_add("/migration/dirty_ring",
+ test_precopy_unix_dirty_ring);
+ migration_test_add("/migration/vcpu_dirty_limit",
+ test_vcpu_dirty_limit);
}
ret = g_test_run();
--
2.43.0
next prev parent reply other threads:[~2024-01-16 3:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 3:19 [PULL 00/20] Migration 20240116 patches peterx
2024-01-16 3:19 ` [PULL 01/20] migration: Simplify initial conditionals in migration for better readability peterx
2024-01-16 3:19 ` [PULL 02/20] migration/multifd: Remove MultiFDPages_t::packet_num peterx
2024-01-16 3:19 ` [PULL 03/20] migration/multifd: Remove QEMUFile from where it is not needed peterx
2024-01-16 3:19 ` [PULL 04/20] migration/multifd: Change multifd_pages_init argument peterx
2024-01-16 3:19 ` [PULL 05/20] migration: Report error in incoming migration peterx
2024-01-16 3:19 ` [PULL 06/20] tests/qtest/migration: Print migration incoming errors peterx
2024-01-16 3:19 ` [PULL 07/20] tests/qtest/migration: Add a wrapper to print test names peterx
2024-01-16 3:19 ` peterx [this message]
2024-01-16 3:19 ` [PULL 09/20] tests/qtest: Re-enable multifd cancel test peterx
2024-01-16 3:19 ` [PULL 10/20] docs/migration: Create migration/ directory peterx
2024-01-16 3:19 ` [PULL 11/20] docs/migration: Create index page peterx
2024-01-16 3:19 ` [PULL 12/20] docs/migration: Convert virtio.txt into rST peterx
2024-01-16 3:19 ` [PULL 13/20] docs/migration: Split "Backwards compatibility" separately peterx
2024-01-16 3:19 ` [PULL 14/20] docs/migration: Split "Debugging" and "Firmware" peterx
2024-01-16 3:19 ` [PULL 15/20] docs/migration: Split "Postcopy" peterx
2024-01-16 3:19 ` [PULL 16/20] docs/migration: Split "dirty limit" peterx
2024-01-16 3:19 ` [PULL 17/20] docs/migration: Organize "Postcopy" page peterx
2024-01-16 3:19 ` [PULL 18/20] docs/migration: Further move vfio to be feature of migration peterx
2024-01-16 3:19 ` [PULL 19/20] docs/migration: Further move virtio " peterx
2024-01-16 3:19 ` [PULL 20/20] migration/rdma: define htonll/ntohll only if not predefined peterx
2024-01-16 16:33 ` [PULL 00/20] Migration 20240116 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240116031947.69017-9-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=farosas@suse.de \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).