[for-2.3] fw_cfg-test: Fix test path to include architecture

Use qtest_add_func() instead of g_test_add_func() to reflect
the architecture tested, changing GTester paths as follows:

  /fw_cfg/foo -> /x86_64/fw_cfg/foo etc.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 tests/fw_cfg-test.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Am 19.03.2015 um 18:47 schrieb Andreas Färber:
> Use qtest_add_func() instead of g_test_add_func() to reflect
> the architecture tested, changing GTester paths as follows:
> 
>   /fw_cfg/foo -> /x86_64/fw_cfg/foo etc.
> 

Actually this should even be

Cc: qemu-stable@nongnu.org

It's been wrong since the beginning.

Andreas

> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  tests/fw_cfg-test.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
> index 5c8f8d6..9be78e9 100644
> --- a/tests/fw_cfg-test.c
> +++ b/tests/fw_cfg-test.c
> @@ -109,21 +109,21 @@ int main(int argc, char **argv)
>  
>      fw_cfg = pc_fw_cfg_init();
>  
> -    g_test_add_func("/fw_cfg/signature", test_fw_cfg_signature);
> -    g_test_add_func("/fw_cfg/id", test_fw_cfg_id);
> -    g_test_add_func("/fw_cfg/uuid", test_fw_cfg_uuid);
> -    g_test_add_func("/fw_cfg/ram_size", test_fw_cfg_ram_size);
> -    g_test_add_func("/fw_cfg/nographic", test_fw_cfg_nographic);
> -    g_test_add_func("/fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
> +    qtest_add_func("fw_cfg/signature", test_fw_cfg_signature);
> +    qtest_add_func("fw_cfg/id", test_fw_cfg_id);
> +    qtest_add_func("fw_cfg/uuid", test_fw_cfg_uuid);
> +    qtest_add_func("fw_cfg/ram_size", test_fw_cfg_ram_size);
> +    qtest_add_func("fw_cfg/nographic", test_fw_cfg_nographic);
> +    qtest_add_func("fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
>  #if 0
> -    g_test_add_func("/fw_cfg/machine_id", test_fw_cfg_machine_id);
> -    g_test_add_func("/fw_cfg/kernel", test_fw_cfg_kernel);
> -    g_test_add_func("/fw_cfg/initrd", test_fw_cfg_initrd);
> -    g_test_add_func("/fw_cfg/boot_device", test_fw_cfg_boot_device);
> +    qtest_add_func("fw_cfg/machine_id", test_fw_cfg_machine_id);
> +    qtest_add_func("fw_cfg/kernel", test_fw_cfg_kernel);
> +    qtest_add_func("fw_cfg/initrd", test_fw_cfg_initrd);
> +    qtest_add_func("fw_cfg/boot_device", test_fw_cfg_boot_device);
>  #endif
> -    g_test_add_func("/fw_cfg/max_cpus", test_fw_cfg_max_cpus);
> -    g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa);
> -    g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu);
> +    qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus);
> +    qtest_add_func("fw_cfg/numa", test_fw_cfg_numa);
> +    qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu);
>  
>      cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");
>      s = qtest_start(cmdline);

On 19/03/2015 18:47, Andreas Färber wrote:
> Use qtest_add_func() instead of g_test_add_func() to reflect
> the architecture tested, changing GTester paths as follows:
> 
>   /fw_cfg/foo -> /x86_64/fw_cfg/foo etc.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  tests/fw_cfg-test.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
> index 5c8f8d6..9be78e9 100644
> --- a/tests/fw_cfg-test.c
> +++ b/tests/fw_cfg-test.c
> @@ -109,21 +109,21 @@ int main(int argc, char **argv)
>  
>      fw_cfg = pc_fw_cfg_init();
>  
> -    g_test_add_func("/fw_cfg/signature", test_fw_cfg_signature);
> -    g_test_add_func("/fw_cfg/id", test_fw_cfg_id);
> -    g_test_add_func("/fw_cfg/uuid", test_fw_cfg_uuid);
> -    g_test_add_func("/fw_cfg/ram_size", test_fw_cfg_ram_size);
> -    g_test_add_func("/fw_cfg/nographic", test_fw_cfg_nographic);
> -    g_test_add_func("/fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
> +    qtest_add_func("fw_cfg/signature", test_fw_cfg_signature);
> +    qtest_add_func("fw_cfg/id", test_fw_cfg_id);
> +    qtest_add_func("fw_cfg/uuid", test_fw_cfg_uuid);
> +    qtest_add_func("fw_cfg/ram_size", test_fw_cfg_ram_size);
> +    qtest_add_func("fw_cfg/nographic", test_fw_cfg_nographic);
> +    qtest_add_func("fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
>  #if 0
> -    g_test_add_func("/fw_cfg/machine_id", test_fw_cfg_machine_id);
> -    g_test_add_func("/fw_cfg/kernel", test_fw_cfg_kernel);
> -    g_test_add_func("/fw_cfg/initrd", test_fw_cfg_initrd);
> -    g_test_add_func("/fw_cfg/boot_device", test_fw_cfg_boot_device);
> +    qtest_add_func("fw_cfg/machine_id", test_fw_cfg_machine_id);
> +    qtest_add_func("fw_cfg/kernel", test_fw_cfg_kernel);
> +    qtest_add_func("fw_cfg/initrd", test_fw_cfg_initrd);
> +    qtest_add_func("fw_cfg/boot_device", test_fw_cfg_boot_device);
>  #endif
> -    g_test_add_func("/fw_cfg/max_cpus", test_fw_cfg_max_cpus);
> -    g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa);
> -    g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu);
> +    qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus);
> +    qtest_add_func("fw_cfg/numa", test_fw_cfg_numa);
> +    qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu);
>  
>      cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");
>      s = qtest_start(cmdline);
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>