OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: acpi: report names of expected files in verbose mode

Browse Source 
print expected file name if it doesn't exists if
verbose mode is enabled*. It helps to avoid running
bios-tables-test under debugger to figure out missing
file name.

*)
verbose mode is enabled if "V" env. variable is set

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Igor Mammedov 2016-05-26 11:46:45 +02:00 committed by Michael S. Tsirkin
parent 7646240580
commit d19587db9e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/bios-tables-test.c
View File

@ -464,7 +464,6 @@ static GArray *load_expected_aml(test_data *data)
{ {
int i; int i;
AcpiSdtTable *sdt; AcpiSdtTable *sdt;
gchar *aml_file = NULL;
GError *error = NULL; GError *error = NULL;
gboolean ret; gboolean ret;
@ -472,6 +471,7 @@ static GArray *load_expected_aml(test_data *data)
for (i = 0; i < data->tables->len; ++i) { for (i = 0; i < data->tables->len; ++i) {
AcpiSdtTable exp_sdt; AcpiSdtTable exp_sdt;
uint32_t signature; uint32_t signature;
gchar *aml_file = NULL;
const char *ext = data->variant ? data->variant : ""; const char *ext = data->variant ? data->variant : "";
sdt = &g_array_index(data->tables, AcpiSdtTable, i); sdt = &g_array_index(data->tables, AcpiSdtTable, i);
@ -484,13 +484,21 @@ static GArray *load_expected_aml(test_data *data)
try_again: try_again:
aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
(gchar *)&signature, ext); (gchar *)&signature, ext);
if (data->variant && !g_file_test(aml_file, G_FILE_TEST_EXISTS)) { if (getenv("V")) {
g_free(aml_file); fprintf(stderr, "\nLooking for expected file '%s'\n", aml_file);
}
if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
exp_sdt.aml_file = aml_file;
} else if (*ext != '\0') {
/* try fallback to generic (extention less) expected file */
ext = ""; ext = "";
g_free(aml_file);
goto try_again; goto try_again;
} }
exp_sdt.aml_file = aml_file; g_assert(exp_sdt.aml_file);
g_assert(g_file_test(aml_file, G_FILE_TEST_EXISTS)); if (getenv("V")) {
fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
}
ret = g_file_get_contents(aml_file, &exp_sdt.aml, ret = g_file_get_contents(aml_file, &exp_sdt.aml,
&exp_sdt.aml_len, &error); &exp_sdt.aml_len, &error);
g_assert(ret); g_assert(ret);