| Message ID | 1427307623-2425-4-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On 03/25/2015 02:20 PM, Andreas Färber 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ärber <afaerber@suse.de> > --- > 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)(FirmwareTestFixture *f, > gconstpointer test_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 = 1; > > - g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaults); > - 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 = g_test_run(); > return ret; > Reviewed-by: John Snow <jsnow@redhat.com>
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)(FirmwareTestFixture *f, gconstpointer test_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 = 1; - g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaults); - 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 = g_test_run(); return ret;
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ärber <afaerber@suse.de> --- tests/i440fx-test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)