| Message ID | 1501515652-33372-2-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 31/07/2017 18:40, Igor Mammedov wrote: > at best it's confusing that array for list of tables to be tested > against reference tables is allocated within test_acpi_dsdt_table() > and at worst it would just overwrite list of tables if they were > added before test_acpi_dsdt_table(). > Move array initialization to test_acpi_one() before we start > processing tables. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > tests/bios-tables-test.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 63da978..b72fa80 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -229,12 +229,11 @@ static void test_acpi_dsdt_table(test_data *data) > uint32_t addr = data->fadt_table.dsdt; > > memset(&dsdt_table, 0, sizeof(dsdt_table)); > - data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); > > test_dst_table(&dsdt_table, addr); > ACPI_ASSERT_CMP(dsdt_table.header.signature, "DSDT"); > > - /* Place DSDT first */ > + /* Since DSDT isn't in RSDT, add DSDT to ASL test tables list manually */ > g_array_append_val(data->tables, dsdt_table); > } > > @@ -634,6 +633,7 @@ static void test_acpi_one(const char *params, test_data *data) > > boot_sector_test(); > > + data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); > test_acpi_rsdp_address(data); > test_acpi_rsdp_table(data); > test_acpi_rsdt_table(data); > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 63da978..b72fa80 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -229,12 +229,11 @@ static void test_acpi_dsdt_table(test_data *data) uint32_t addr = data->fadt_table.dsdt; memset(&dsdt_table, 0, sizeof(dsdt_table)); - data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); test_dst_table(&dsdt_table, addr); ACPI_ASSERT_CMP(dsdt_table.header.signature, "DSDT"); - /* Place DSDT first */ + /* Since DSDT isn't in RSDT, add DSDT to ASL test tables list manually */ g_array_append_val(data->tables, dsdt_table); } @@ -634,6 +633,7 @@ static void test_acpi_one(const char *params, test_data *data) boot_sector_test(); + data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); test_acpi_rsdp_address(data); test_acpi_rsdp_table(data); test_acpi_rsdt_table(data);
at best it's confusing that array for list of tables to be tested against reference tables is allocated within test_acpi_dsdt_table() and at worst it would just overwrite list of tables if they were added before test_acpi_dsdt_table(). Move array initialization to test_acpi_one() before we start processing tables. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- tests/bios-tables-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)