Commit 53f77e45 authored by Andreas Färber's avatar Andreas Färber
Browse files

tests: Use qtest_add_data_func() consistently 



Replace uses of g_test_add_data_func() for QTest test cases.

It is still valid to use it for any non-QTest test cases,
which are not run for multiple target binaries.

Suggested-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 6bc5cf92

tests/ahci-test.c

+2 −7
Original line number Diff line number Diff line
@@ -1486,7 +1486,6 @@ static void test_io_interface(gconstpointer opaque) 
static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,

                                enum BuffLen len, enum OffsetType offset)

{

    static const char *arch;

    char *name;

    AHCIIOTestOptions *opts = g_malloc(sizeof(AHCIIOTestOptions));
@@ -1495,17 +1494,13 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr, 
    opts->io_type = type;

    opts->offset = offset;



    if (!arch) {

        arch = qtest_get_arch();

    }



    name = g_strdup_printf("/%s/ahci/io/%s/%s/%s/%s", arch,

    name = g_strdup_printf("ahci/io/%s/%s/%s/%s",

                           io_mode_str[type],

                           addr_mode_str[addr],

                           buff_len_str[len],

                           offset_str[offset]);



    g_test_add_data_func(name, opts, test_io_interface);

    qtest_add_data_func(name, opts, test_io_interface);

    g_free(name);

}

tests/e1000-test.c

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ int main(int argc, char **argv) 
    for (i = 0; i < ARRAY_SIZE(models); i++) {

        char *path;



        path = g_strdup_printf("/%s/e1000/%s", qtest_get_arch(), models[i]);

        g_test_add_data_func(path, models[i], test_device);

        path = g_strdup_printf("e1000/%s", models[i]);

        qtest_add_data_func(path, models[i], test_device);

    }



    return g_test_run();

tests/eepro100-test.c

+2 −3
Original line number Diff line number Diff line
@@ -54,9 +54,8 @@ int main(int argc, char **argv) 
    for (i = 0; i < ARRAY_SIZE(models); i++) {

        char *path;



        path = g_strdup_printf("/%s/eepro100/%s",

                               qtest_get_arch(), models[i]);

        g_test_add_data_func(path, models[i], test_device);

        path = g_strdup_printf("eepro100/%s", models[i]);

        qtest_add_data_func(path, models[i], test_device);

    }



    return g_test_run();

tests/endianness-test.c

+9 −9
Original line number Diff line number Diff line
@@ -296,17 +296,17 @@ int main(int argc, char **argv) 
        if (strcmp(test_cases[i].arch, arch) != 0) {

            continue;

        }

        path = g_strdup_printf("/%s/endianness/%s",

                               arch, test_cases[i].machine);

        g_test_add_data_func(path, &test_cases[i], test_endianness);

        path = g_strdup_printf("endianness/%s",

                               test_cases[i].machine);

        qtest_add_data_func(path, &test_cases[i], test_endianness);



        path = g_strdup_printf("/%s/endianness/split/%s",

                               arch, test_cases[i].machine);

        g_test_add_data_func(path, &test_cases[i], test_endianness_split);

        path = g_strdup_printf("endianness/split/%s",

                               test_cases[i].machine);

        qtest_add_data_func(path, &test_cases[i], test_endianness_split);



        path = g_strdup_printf("/%s/endianness/combine/%s",

                               arch, test_cases[i].machine);

        g_test_add_data_func(path, &test_cases[i], test_endianness_combine);

        path = g_strdup_printf("endianness/combine/%s",

                               test_cases[i].machine);

        qtest_add_data_func(path, &test_cases[i], test_endianness_combine);

    }



    ret = g_test_run();

tests/pc-cpu-test.c

+6 −7
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void test_pc_without_cpu_add(gconstpointer data) 


static void add_pc_test_cases(void)

{

    const char *arch = qtest_get_arch();

    QDict *response, *minfo;

    QList *list;

    const QListEntry *p;
@@ -119,15 +118,15 @@ static void add_pc_test_cases(void) 
            (strcmp(mname, "pc-0.12") == 0) ||

            (strcmp(mname, "pc-0.11") == 0) ||

            (strcmp(mname, "pc-0.10") == 0)) {

            path = g_strdup_printf("/%s/cpu/%s/init/%ux%ux%u&maxcpus=%u",

                                   arch, mname, data->sockets, data->cores,

            path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u",

                                   mname, data->sockets, data->cores,

                                   data->threads, data->maxcpus);

            g_test_add_data_func(path, data, test_pc_without_cpu_add);

            qtest_add_data_func(path, data, test_pc_without_cpu_add);

        } else {

            path = g_strdup_printf("/%s/cpu/%s/add/%ux%ux%u&maxcpus=%u",

                                   arch, mname, data->sockets, data->cores,

            path = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u",

                                   mname, data->sockets, data->cores,

                                   data->threads, data->maxcpus);

            g_test_add_data_func(path, data, test_pc_with_cpu_add);

            qtest_add_data_func(path, data, test_pc_with_cpu_add);

        }

    }

    qtest_end();