From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YatYv-0002mV-1c for qemu-devel@nongnu.org; Wed, 25 Mar 2015 18:14:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YatYu-0001mf-3C for qemu-devel@nongnu.org; Wed, 25 Mar 2015 18:14:08 -0400 Message-ID: <5513332A.7030705@redhat.com> Date: Wed, 25 Mar 2015 18:14:02 -0400 From: John Snow MIME-Version: 1.0 References: <1427307623-2425-1-git-send-email-afaerber@suse.de> <1427307623-2425-4-git-send-email-afaerber@suse.de> In-Reply-To: <1427307623-2425-4-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 v2 3/4] 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, qemu-stable@nongnu.org, stefanha@redhat.com On 03/25/2015 02:20 PM, Andreas F=C3=A4rber wrote: > Replace g_test_add_func() with new qtest_add_func() and g_test_add() > macro with qtest_add() macro. > > Cc: qemu-stable@nongnu.org > Signed-off-by: Andreas F=C3=A4rber > --- > tests/i440fx-test.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c > index a3f7279..d0bc8de 100644 > --- a/tests/i440fx-test.c > +++ b/tests/i440fx-test.c > @@ -383,8 +383,8 @@ 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, > - test_i440fx_firmware, NULL); > + qtest_add(testpath, FirmwareTestFixture, NULL, setup_fixture, > + test_i440fx_firmware, NULL); > } > > static void request_bios(FirmwareTestFixture *fixture, > @@ -408,10 +408,10 @@ 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); > - add_firmware_test("/i440fx/firmware/bios", request_bios); > - add_firmware_test("/i440fx/firmware/pflash", request_pflash); > + 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); > > ret =3D g_test_run(); > return ret; > Reviewed-by: John Snow