From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yapuu-0004dz-DO for qemu-devel@nongnu.org; Wed, 25 Mar 2015 14:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yapus-0003a0-Rb for qemu-devel@nongnu.org; Wed, 25 Mar 2015 14:20:36 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 25 Mar 2015 19:20:23 +0100 Message-Id: <1427307623-2425-5-git-send-email-afaerber@suse.de> In-Reply-To: <1427307623-2425-1-git-send-email-afaerber@suse.de> References: <1427307623-2425-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 4/4] tests: Use qtest_add_data_func() consistently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, "open list:IDE" , jsnow@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , stefanha@redhat.com 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: John Snow Signed-off-by: Andreas F=C3=A4rber --- tests/ahci-test.c | 9 ++------- tests/e1000-test.c | 4 ++-- tests/eepro100-test.c | 5 ++--- tests/endianness-test.c | 18 +++++++++--------- tests/pc-cpu-test.c | 13 ++++++------- tests/qom-test.c | 4 ++-- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index ea62e24..4daa96e 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1045,7 +1045,6 @@ static void test_io_interface(gconstpointer opaque) static void create_ahci_io_test(enum IOMode type, enum AddrMode addr, enum BuffLen len) { - static const char *arch; char *name; AHCIIOTestOptions *opts =3D g_malloc(sizeof(AHCIIOTestOptions)); =20 @@ -1053,16 +1052,12 @@ static void create_ahci_io_test(enum IOMode type,= enum AddrMode addr, opts->address_type =3D addr; opts->io_type =3D type; =20 - if (!arch) { - arch =3D qtest_get_arch(); - } - - name =3D g_strdup_printf("/%s/ahci/io/%s/%s/%s", arch, + name =3D g_strdup_printf("ahci/io/%s/%s/%s", io_mode_str[type], addr_mode_str[addr], buff_len_str[len]); =20 - g_test_add_data_func(name, opts, test_io_interface); + qtest_add_data_func(name, opts, test_io_interface); g_free(name); } =20 diff --git a/tests/e1000-test.c b/tests/e1000-test.c index 81f164d..7ca6d7e 100644 --- a/tests/e1000-test.c +++ b/tests/e1000-test.c @@ -44,8 +44,8 @@ int main(int argc, char **argv) for (i =3D 0; i < ARRAY_SIZE(models); i++) { char *path; =20 - path =3D g_strdup_printf("/%s/e1000/%s", qtest_get_arch(), model= s[i]); - g_test_add_data_func(path, models[i], test_device); + path =3D g_strdup_printf("e1000/%s", models[i]); + qtest_add_data_func(path, models[i], test_device); } =20 return g_test_run(); diff --git a/tests/eepro100-test.c b/tests/eepro100-test.c index bf82526..8bfaccd 100644 --- a/tests/eepro100-test.c +++ b/tests/eepro100-test.c @@ -54,9 +54,8 @@ int main(int argc, char **argv) for (i =3D 0; i < ARRAY_SIZE(models); i++) { char *path; =20 - path =3D g_strdup_printf("/%s/eepro100/%s", - qtest_get_arch(), models[i]); - g_test_add_data_func(path, models[i], test_device); + path =3D g_strdup_printf("eepro100/%s", models[i]); + qtest_add_data_func(path, models[i], test_device); } =20 return g_test_run(); diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 92e17d2..7482ff7 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -298,17 +298,17 @@ int main(int argc, char **argv) if (strcmp(test_cases[i].arch, arch) !=3D 0) { continue; } - path =3D g_strdup_printf("/%s/endianness/%s", - arch, test_cases[i].machine); - g_test_add_data_func(path, &test_cases[i], test_endianness); + path =3D g_strdup_printf("endianness/%s", + test_cases[i].machine); + qtest_add_data_func(path, &test_cases[i], test_endianness); =20 - path =3D 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 =3D g_strdup_printf("endianness/split/%s", + test_cases[i].machine); + qtest_add_data_func(path, &test_cases[i], test_endianness_split)= ; =20 - path =3D g_strdup_printf("/%s/endianness/combine/%s", - arch, test_cases[i].machine); - g_test_add_data_func(path, &test_cases[i], test_endianness_combi= ne); + path =3D g_strdup_printf("endianness/combine/%s", + test_cases[i].machine); + qtest_add_data_func(path, &test_cases[i], test_endianness_combin= e); } =20 ret =3D g_test_run(); diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index a0122d3..3505c7c 100644 --- a/tests/pc-cpu-test.c +++ b/tests/pc-cpu-test.c @@ -75,7 +75,6 @@ static void test_pc_without_cpu_add(gconstpointer data) =20 static void add_pc_test_cases(void) { - const char *arch =3D 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") =3D=3D 0) || (strcmp(mname, "pc-0.11") =3D=3D 0) || (strcmp(mname, "pc-0.10") =3D=3D 0)) { - path =3D g_strdup_printf("/%s/cpu/%s/init/%ux%ux%u&maxcpus=3D= %u", - arch, mname, data->sockets, data->cor= es, + path =3D g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=3D%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 =3D g_strdup_printf("/%s/cpu/%s/add/%ux%ux%u&maxcpus=3D= %u", - arch, mname, data->sockets, data->cor= es, + path =3D g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=3D%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(); diff --git a/tests/qom-test.c b/tests/qom-test.c index 4246382..fde04e7 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -128,8 +128,8 @@ static void add_machine_test_cases(void) g_assert(qstr); mname =3D qstring_get_str(qstr); if (!is_blacklisted(arch, mname)) { - path =3D g_strdup_printf("/%s/qom/%s", arch, mname); - g_test_add_data_func(path, mname, test_machine); + path =3D g_strdup_printf("qom/%s", mname); + qtest_add_data_func(path, mname, test_machine); } } qtest_end(); --=20 2.1.4