[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 7/9] tests: keep compiling failing vhost-user tes
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v6 7/9] tests: keep compiling failing vhost-user tests |
Date: |
Mon, 23 Oct 2017 15:18:13 +0100 |
Let's protect the failing tests under a QTEST_VHOST_USER_FIXME
environment variable, so we keep compiling the tests and we can easily
run them.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/vhost-user-test.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 4b98018478..7fc6f85888 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -31,8 +31,6 @@
#include <linux/virtio_net.h>
#include <sys/vfs.h>
-#define VHOST_USER_NET_TESTS_WORKING 0 /* broken as of 2.10.0 */
-
/* GLIB version compatibility flags */
#if !GLIB_CHECK_VERSION(2, 26, 0)
#define G_TIME_SPAN_SECOND (G_GINT64_CONSTANT(1000000))
@@ -719,7 +717,7 @@ static void wait_for_rings_started(TestServer *s, size_t
count)
g_mutex_unlock(&s->data_mutex);
}
-#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
+#if defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
static inline void test_server_connect(TestServer *server)
{
test_server_create_chr(server, ",reconnect=1");
@@ -965,16 +963,19 @@ int main(int argc, char **argv)
qtest_add_func("/vhost-user/migrate", test_migrate);
qtest_add_func("/vhost-user/multiqueue", test_multiqueue);
-#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
- qtest_add_func("/vhost-user/reconnect/subprocess",
- test_reconnect_subprocess);
- qtest_add_func("/vhost-user/reconnect", test_reconnect);
- qtest_add_func("/vhost-user/connect-fail/subprocess",
- test_connect_fail_subprocess);
- qtest_add_func("/vhost-user/connect-fail", test_connect_fail);
- qtest_add_func("/vhost-user/flags-mismatch/subprocess",
- test_flags_mismatch_subprocess);
- qtest_add_func("/vhost-user/flags-mismatch", test_flags_mismatch);
+#if defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
+ /* keeps failing on build-system since Aug 15 2017 */
+ if (getenv("QTEST_VHOST_USER_FIXME")) {
+ qtest_add_func("/vhost-user/reconnect/subprocess",
+ test_reconnect_subprocess);
+ qtest_add_func("/vhost-user/reconnect", test_reconnect);
+ qtest_add_func("/vhost-user/connect-fail/subprocess",
+ test_connect_fail_subprocess);
+ qtest_add_func("/vhost-user/connect-fail", test_connect_fail);
+ qtest_add_func("/vhost-user/flags-mismatch/subprocess",
+ test_flags_mismatch_subprocess);
+ qtest_add_func("/vhost-user/flags-mismatch", test_flags_mismatch);
+ }
#endif
ret = g_test_run();
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PATCH v6 0/9] Add memfd memory backend, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 1/9] memfd: split qemu_memfd_alloc(), Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 2/9] memfd: remove needless include, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 4/9] memfd: add hugetlb support, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 3/9] memfd: add error argument, instead of perror(), Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 5/9] memfd: add hugetlbsize argument, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 6/9] Add memfd based hostmem, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 8/9] vhost-user-test: make read-guest-mem setup its own qemu, Marc-André Lureau, 2017/10/23
- [Qemu-devel] [PATCH v6 7/9] tests: keep compiling failing vhost-user tests,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v6 9/9] tests: use memfd in vhost-user-test, Marc-André Lureau, 2017/10/23