Commit 7a9ec654 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

tests: keep compiling failing vhost-user tests 



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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180201132757.23063-6-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dbb9e0f4

tests/vhost-user-test.c

+14 −13
Original line number Diff line number Diff line
@@ -30,8 +30,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))
@@ -765,7 +763,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");
@@ -956,7 +954,9 @@ 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)

#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);
@@ -966,6 +966,7 @@ int main(int argc, char **argv) 
        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();