From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7Rhm-0006Ok-W2 for qemu-devel@nongnu.org; Mon, 30 May 2016 14:14:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7Rhi-00036R-PG for qemu-devel@nongnu.org; Mon, 30 May 2016 14:14:21 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7Rhi-00035y-2J for qemu-devel@nongnu.org; Mon, 30 May 2016 14:14:18 -0400 Received: by mail-wm0-x244.google.com with SMTP id q62so25075306wmg.3 for ; Mon, 30 May 2016 11:14:16 -0700 (PDT) Reply-To: marcel@redhat.com References: <57448843.4060703@redhat.com> <1464256005-75435-1-git-send-email-imammedo@redhat.com> From: Marcel Apfelbaum Message-ID: <574C82F4.3010204@gmail.com> Date: Mon, 30 May 2016 21:14:12 +0300 MIME-Version: 1.0 In-Reply-To: <1464256005-75435-1-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/33] tests: acpi: report names of expected files in verbose mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com On 05/26/2016 12:46 PM, Igor Mammedov wrote: > 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 > --- > v2: replace 'for' loop with more readble 'goto' > Marcel Apfelbaum > --- > tests/bios-tables-test.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 0352814..f0493f8 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,6 +471,7 @@ 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 : ""; > > sdt = &g_array_index(data->tables, AcpiSdtTable, i); > @@ -484,13 +484,21 @@ static GArray *load_expected_aml(test_data *data) > 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)) { > - g_free(aml_file); > + if (getenv("V")) { > + 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 = ""; > + g_free(aml_file); > 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); > Reviewed-by: Marcel Apfelbaum Thanks, Marcel