From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaXxB-0003PZ-R1 for qemu-devel@nongnu.org; Tue, 24 Mar 2015 19:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaXx7-0001Bt-RE for qemu-devel@nongnu.org; Tue, 24 Mar 2015 19:09:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaXx7-0001Bi-HQ for qemu-devel@nongnu.org; Tue, 24 Mar 2015 19:09:41 -0400 Message-ID: <5511EEB1.7010306@redhat.com> Date: Tue, 24 Mar 2015 19:09:37 -0400 From: John Snow MIME-Version: 1.0 References: <1427237148-8728-1-git-send-email-afaerber@suse.de> <1427237148-8728-3-git-send-email-afaerber@suse.de> In-Reply-To: <1427237148-8728-3-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.3 2/2] i440fx-test: Fix test paths to include architecture List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, stefanha@redhat.com, peter.maydell@linaro.org On 03/24/2015 06:45 PM, Andreas F=C3=A4rber wrote: > Replace g_test_add_func() with new qtest_add_func() and modify the path > passed to g_test_add() macro. > > Signed-off-by: Andreas F=C3=A4rber > --- > tests/i440fx-test.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c > index a3f7279..bc3f54c 100644 > --- a/tests/i440fx-test.c > +++ b/tests/i440fx-test.c > @@ -383,8 +383,10 @@ static void add_firmware_test(const char *testpath= , > void (*setup_fixture)(FirmwareTestFixtu= re *f, > gconstpointer tes= t_data)) > { > - g_test_add(testpath, FirmwareTestFixture, NULL, setup_fixture, > + char *path =3D g_strdup_printf("/%s%s", qtest_get_arch(), testpath= ); > + g_test_add(path, FirmwareTestFixture, NULL, setup_fixture, > test_i440fx_firmware, NULL); > + g_free(path); > } > Is it not worth adding an even more generic wrapper to prevent future=20 desynch from our preferred path format? > static void request_bios(FirmwareTestFixture *fixture, > @@ -408,8 +410,8 @@ int main(int argc, char **argv) > > data.num_cpus =3D 1; > > - g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaul= ts); > - g_test_add_data_func("/i440fx/pam", &data, test_i440fx_pam); > + qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults= ); > + qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam); > add_firmware_test("/i440fx/firmware/bios", request_bios); > add_firmware_test("/i440fx/firmware/pflash", request_pflash); > > Similar to above, is it worth replacing other test's usage of=20 g_test_add_data_func to force this standard path format everywhere? --js