From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axD4L-0007X8-3G for qemu-devel@nongnu.org; Mon, 02 May 2016 08:35:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axD49-0000IG-GT for qemu-devel@nongnu.org; Mon, 02 May 2016 08:35:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axD49-00009C-Ba for qemu-devel@nongnu.org; Mon, 02 May 2016 08:35:09 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 419027F6A7 for ; Mon, 2 May 2016 12:34:58 +0000 (UTC) From: Igor Mammedov Date: Mon, 2 May 2016 14:33:46 +0200 Message-Id: <1462192431-146342-38-git-send-email-imammedo@redhat.com> In-Reply-To: <1462192431-146342-1-git-send-email-imammedo@redhat.com> References: <1462192431-146342-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [RFC 37/42] tests: acpi: report names of expected files in verbose mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, ehabkost@redhat.com, marcel@redhat.com, eblake@redhat.com, armbru@redhat.com, drjones@redhat.com 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 --- 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