From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5FfZ-0000Hb-1I for qemu-devel@nongnu.org; Tue, 24 May 2016 12:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5FfU-0003KN-Oq for qemu-devel@nongnu.org; Tue, 24 May 2016 12:59:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5FfU-0003KG-GD for qemu-devel@nongnu.org; Tue, 24 May 2016 12:58:56 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 063EA8E249 for ; Tue, 24 May 2016 16:58:56 +0000 (UTC) References: <1463496205-251412-1-git-send-email-imammedo@redhat.com> <1463496205-251412-2-git-send-email-imammedo@redhat.com> From: Marcel Apfelbaum Message-ID: <57448843.4060703@redhat.com> Date: Tue, 24 May 2016 19:58:43 +0300 MIME-Version: 1.0 In-Reply-To: <1463496205-251412-2-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/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: mst@redhat.com, rkrcmar@redhat.com, ehabkost@redhat.com, drjones@redhat.com, armbru@redhat.com On 05/17/2016 05:42 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 > --- > 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 0352814..9acf9ba 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) { Can you please make this code more readable ? I am kind of lost. I do agree with what the patch tries to achieve. Thanks, Marcel > 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); >