Commit 6ca90ffe authored by Andreas Färber's avatar Andreas Färber
Browse files

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: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 45b0f830

tests/i440fx-test.c

+6 −6
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void add_firmware_test(const char *testpath, 
                              void (*setup_fixture)(FirmwareTestFixture *f,

                                                    gconstpointer test_data))

{

    g_test_add(testpath, FirmwareTestFixture, NULL, setup_fixture,

    qtest_add(testpath, FirmwareTestFixture, NULL, setup_fixture,

              test_i440fx_firmware, NULL);

}
@@ -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;