[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 37/42] tests: acpi: report names of expected files in
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [RFC 37/42] tests: acpi: report names of expected files in verbose mode |
Date: |
Mon, 2 May 2016 14:33:46 +0200 |
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 <address@hidden>
---
tests/bios-tables-test.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 191e701..53c0f6a 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -464,7 +464,6 @@ static GArray *load_expected_aml(test_data *data)
{
int i;
AcpiSdtTable *sdt;
- gchar *aml_file = NULL;
GError *error = NULL;
gboolean ret;
@@ -472,7 +471,9 @@ static GArray *load_expected_aml(test_data *data)
for (i = 0; i < data->tables->len; ++i) {
AcpiSdtTable exp_sdt;
uint32_t signature;
+ gchar *aml_file = NULL;
const char *ext = data->variant ? data->variant : "";
+ int j;
sdt = &g_array_index(data->tables, AcpiSdtTable, i);
@@ -481,16 +482,23 @@ static GArray *load_expected_aml(test_data *data)
signature = cpu_to_le32(sdt->header.signature);
-try_again:
- aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
- (gchar *)&signature, ext);
- if (data->variant && !g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+ for (j = 2; j; j -= data->variant ? 1 : 2) {
g_free(aml_file);
+ aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
+ (gchar *)&signature, ext);
+ if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+ exp_sdt.aml_file = aml_file;
+ break;
+ }
+ if (getenv("V")) {
+ fprintf(stderr, "\nLooking for expected file '%s'\n",
aml_file);
+ }
ext = "";
- goto try_again;
}
- exp_sdt.aml_file = aml_file;
- g_assert(g_file_test(aml_file, G_FILE_TEST_EXISTS));
+ g_assert(exp_sdt.aml_file);
+ if (getenv("V")) {
+ fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
+ }
ret = g_file_get_contents(aml_file, &exp_sdt.aml,
&exp_sdt.aml_len, &error);
g_assert(ret);
--
1.8.3.1
- Re: [Qemu-devel] [RFC 23/42] tests: pc-cpu-test: turn on cpu-hotplug explicily, (continued)
- [Qemu-devel] [RFC 30/42] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 34/42] acpi: cpuhp: add command and data registers, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 35/42] acpi: cpuhp: provide cpu._PXM method if running in numa mode, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 40/42] tests: acpi: extend CPU hotplug test with NUMA support, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 38/42] tests: acpi: add CPU hotplug testcase, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 42/42] DO NOT APPLY: simulate CPU unplug when executin cpu-add on a present CPU, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 36/42] acpi: cpuhp: add cpu._OST handling, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 37/42] tests: acpi: report names of expected files in verbose mode,
Igor Mammedov <=
- [Qemu-devel] [RFC 33/42] target-i386: add X86CPU.node property, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 41/42] tests: acpi: cpuhp: add expected SRAT tables and update DSDT with _PXM support, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 39/42] tests: acpi: add expected tables for CPU hotplug case, Igor Mammedov, 2016/05/02