Commit 51b3ca97 authored by Thomas Huth's avatar Thomas Huth
Browse files

tests/qtest: Unify the test for the xenfv and xenpv machines 



We have the same check in three places. Let's unify it in a central
place instead.

Message-Id: <20200622104339.21000-1-thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent dda2f556

tests/qtest/device-introspect-test.c

+0 −5
Original line number Diff line number Diff line
@@ -287,11 +287,6 @@ static void add_machine_test_case(const char *mname) 
{

    char *path, *args;



    /* Ignore blacklisted machines */

    if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {

        return;

    }



    path = g_strdup_printf("device/introspect/concrete/defaults/%s", mname);

    args = g_strdup_printf("-M %s", mname);

    qtest_add_data_func(path, args, test_device_intro_concrete);

tests/qtest/libqtest.c

+4 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,10 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine), 
        qstr = qobject_to(QString, qobj);

        g_assert(qstr);

        mname = qstring_get_str(qstr);

        /* Ignore machines that cannot be used for qtests */

        if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {

            continue;

        }

        if (!skip_old_versioned || !qtest_is_old_versioned_machine(mname)) {

            cb(mname);

        }

tests/qtest/qom-test.c

+0 −5
Original line number Diff line number Diff line
@@ -81,11 +81,6 @@ static void add_machine_test_case(const char *mname) 
{

    char *path;



    /* Ignore blacklisted machines that have known problems */

    if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {

        return;

    }



    path = g_strdup_printf("qom/%s", mname);

    qtest_add_data_func(path, g_strdup(mname), test_machine);

    g_free(path);

tests/qtest/test-hmp.c

+0 −5
Original line number Diff line number Diff line
@@ -143,11 +143,6 @@ static void add_machine_test_case(const char *mname) 
{

    char *path;



    /* Ignore blacklisted machines that have known problems */

    if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {

        return;

    }



    path = g_strdup_printf("hmp/%s", mname);

    qtest_add_data_func(path, g_strdup(mname), test_machine);

    g_free(path);