aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2015-03-24 19:35:22 +0100
committerAndreas Färber <afaerber@suse.de>2015-03-30 19:24:54 +0200
commit6ca90ffeec8e3b4e306be32efd930d75a6d0b295 (patch)
treec6a835e234ddee67cb89fc9660a825713697541b
parent45b0f830dd1817277eeb97032ce64b3103fe0b6c (diff)
downloadqemu-arm-6ca90ffeec8e3b4e306be32efd930d75a6d0b295.tar.gz
i440fx-test: Fix test paths to include architecture
Replace g_test_add_func() with new qtest_add_func() and g_test_add() macro with qtest_add() macro. This effectively changes GTester paths: /i440fx/foo -> /x86_64/i440fx/foo etc. Cc: qemu-stable@nongnu.org Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--tests/i440fx-test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index a3f72790ea..d0bc8de25a 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;