From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org,
Richard Henderson <richard.henderson@linaro.org>,
Peter Maydell <peter.maydell@linaro.org>
Cc: Bin Meng <bin.meng@windriver.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [PULL 10/23] tests/qtest: migration-test: Skip running test_migrate_fd_proto on win32
Date: Tue, 30 Aug 2022 20:39:59 +0200 [thread overview]
Message-ID: <20220830184012.77978-11-thuth@redhat.com> (raw)
In-Reply-To: <20220830184012.77978-1-thuth@redhat.com>
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>
Message-Id: <20220824094029.1634519-22-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@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 18d30bfc3c..4728d528bb 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1631,6 +1631,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)
{
@@ -1699,6 +1700,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.31.1
next prev parent reply other threads:[~2022-08-30 19:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 18:39 [PULL 00/23] First testing patches for QEMU 7.2 Thomas Huth
2022-08-30 18:39 ` [PULL 01/23] tests/qtest: Use g_setenv() Thomas Huth
2022-08-30 18:39 ` [PULL 02/23] tests/qtest: Use g_mkdtemp() Thomas Huth
2022-08-30 18:39 ` [PULL 03/23] tests: Use g_mkdir_with_parents() Thomas Huth
2022-08-30 18:39 ` [PULL 04/23] tests/qtest: migration-test: Handle link() for win32 Thomas Huth
2022-08-30 18:39 ` [PULL 05/23] backends/tpm: Exclude headers and macros that don't exist on win32 Thomas Huth
2022-08-30 18:39 ` [PULL 06/23] tests/qtest: Adapt {m48t59,rtc}-test cases for win32 Thomas Huth
2022-08-30 18:39 ` [PULL 07/23] tests/qtest: Build e1000e-test for posix only Thomas Huth
2022-08-30 18:39 ` [PULL 08/23] tests/qtest: Build cases that use memory-backend-file " Thomas Huth
2022-08-30 18:39 ` [PULL 09/23] tests/qtest: i440fx-test: Skip running request_{bios, pflash} for win32 Thomas Huth
2022-08-30 18:39 ` Thomas Huth [this message]
2022-08-30 18:40 ` [PULL 11/23] tests/qtest: libqos: Drop inclusion of <sys/wait.h> Thomas Huth
2022-08-30 18:40 ` [PULL 12/23] tests/qtest: libqos: Rename malloc.h to libqos-malloc.h Thomas Huth
2022-08-30 18:40 ` [PULL 13/23] tests/qtest: device-plug-test: Reverse the usage of double/single quotes Thomas Huth
2022-08-30 18:40 ` [PULL 14/23] tests/qtest: machine-none-test: Use double quotes to pass the cpu option Thomas Huth
2022-08-30 18:40 ` [PULL 15/23] tests/qtest: npcm7xx_emc-test: Skip running test_{tx, rx} on win32 Thomas Huth
2022-08-30 18:40 ` [PULL 16/23] tests/qtest: prom-env-test: Use double quotes to pass the prom-env option Thomas Huth
2022-08-30 18:40 ` [PULL 17/23] tests/vm: Add libslirp to the VM tests Thomas Huth
2022-08-30 18:40 ` [PULL 18/23] tests/avocado: Do not run tests that require libslirp if it is not available Thomas Huth
2022-08-30 18:40 ` [PULL 19/23] tests/avocado: Fix trivial typo Thomas Huth
2022-08-30 18:40 ` [PULL 20/23] docs/devel/testing: fix minor typo Thomas Huth
2022-08-30 18:40 ` [PULL 21/23] gitlab-ci: Only use one process in Windows jobs for compilation Thomas Huth
2022-08-30 18:40 ` [PULL 22/23] tests/qtest/ac97-test: Correct reference to driver Thomas Huth
2022-08-30 18:40 ` [PULL 23/23] tests/avocado/migration: Get find_free_port() from the ports Thomas Huth
2022-08-31 23:54 ` [PULL 00/23] First testing patches for QEMU 7.2 Stefan Hajnoczi
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=20220830184012.77978-11-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=bin.meng@windriver.com \
--cc=dgilbert@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).