2bd5f3733b
Update to v2.3.0-rc1 and disable building x86 firmware on 11.4 OBS-URL: https://build.opensuse.org/request/show/293337 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=241
59 lines
2.6 KiB
Diff
59 lines
2.6 KiB
Diff
From 07b2c7c8424f2e2036a882190dab1d9a56b3bb3e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
|
Date: Thu, 19 Mar 2015 18:47:52 +0100
|
|
Subject: [PATCH] fw_cfg-test: Fix test path to include architecture
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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.
|
|
|
|
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
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);
|