We have been restricting our fw_cfg tests to the PC machine, which is a little-endian architecture. The fw_cfg device is also used on the SPARC and PowerPC architectures, which can run in big-endian configuration.
Since we want to be sure our device does not regress regardless the endianess used, enable this test one these targets. The NUMA selector is X86 specific, restrict it to this arch. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/Makefile.include | 2 ++ tests/fw_cfg-test.c | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3543451ed3..322bdb36ff 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -242,6 +242,7 @@ check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF) check-qtest-ppc64-y += tests/numa-test$(EXESUF) check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF) check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF) +check-qtest-ppc64-y += tests/fw_cfg-test$(EXESUF) check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) @@ -250,6 +251,7 @@ check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) check-qtest-sparc-y += tests/prom-env-test$(EXESUF) check-qtest-sparc-y += tests/m48t59-test$(EXESUF) check-qtest-sparc-y += tests/boot-serial-test$(EXESUF) +check-qtest-sparc-y += tests/fw_cfg-test$(EXESUF) check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 12dbaf4e67..39bbc9647e 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -209,13 +209,22 @@ static void test_fw_cfg_splash_time(const void *opaque) int main(int argc, char **argv) { + const char *arch = qtest_get_arch(); QTestCtx *ctx = g_new(QTestCtx, 1); int ret; g_test_init(&argc, &argv, NULL); - ctx->machine_name = "pc"; - ctx->fw_cfg = pc_fw_cfg_init(); + if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64")) { + ctx->machine_name = "pc"; + ctx->fw_cfg = pc_fw_cfg_init(); + } else if (g_str_equal(arch, "sparc")) { + ctx->machine_name = "SS-5"; + ctx->fw_cfg = mm_fw_cfg_init(0xd00000510ULL); + } else if (g_str_equal(arch, "ppc64")) { + ctx->machine_name = "mac99"; + ctx->fw_cfg = mm_fw_cfg_init(0xf0000510); + } qtest_add_data_func("fw_cfg/signature", ctx, test_fw_cfg_signature); qtest_add_data_func("fw_cfg/id", ctx, test_fw_cfg_id); @@ -230,12 +239,15 @@ int main(int argc, char **argv) qtest_add_func("fw_cfg/boot_device", test_fw_cfg_boot_device); #endif qtest_add_data_func("fw_cfg/max_cpus", ctx, test_fw_cfg_max_cpus); - qtest_add_data_func("fw_cfg/numa", ctx, test_fw_cfg_numa); qtest_add_data_func("fw_cfg/boot_menu", ctx, test_fw_cfg_boot_menu); qtest_add_data_func("fw_cfg/reboot_timeout", ctx, test_fw_cfg_reboot_timeout); qtest_add_data_func("fw_cfg/splash_time", ctx, test_fw_cfg_splash_time); + if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64")) { + qtest_add_data_func("fw_cfg/numa", ctx, test_fw_cfg_numa); + } + ret = g_test_run(); g_free(ctx->fw_cfg); -- 2.20.1
