| Message ID | 1547566866-129386-10-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests: acpi: add UEFI (ARM) testing support | expand |
On 1/15/19 4:41 PM, Igor Mammedov wrote: > boot_sector_init() won't be used by arm/virt board, so move it from > global scope to x86 branch that uses it. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/bios-tables-test.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index d290dd2..d9efe59 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -799,13 +799,13 @@ int main(int argc, char *argv[]) > const char *arch = qtest_get_arch(); > int ret; > > - ret = boot_sector_init(disk); > - if(ret) > - return ret; > - > g_test_init(&argc, &argv, NULL); > > if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { > + ret = boot_sector_init(disk); > + if(ret) > + return ret; > + > qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); > qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge); > qtest_add_func("acpi/q35", test_acpi_q35_tcg); >
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d290dd2..d9efe59 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -799,13 +799,13 @@ int main(int argc, char *argv[]) const char *arch = qtest_get_arch(); int ret; - ret = boot_sector_init(disk); - if(ret) - return ret; - g_test_init(&argc, &argv, NULL); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + ret = boot_sector_init(disk); + if(ret) + return ret; + qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge); qtest_add_func("acpi/q35", test_acpi_q35_tcg);
boot_sector_init() won't be used by arm/virt board, so move it from global scope to x86 branch that uses it. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- tests/bios-tables-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)