diff mbox

[v2,1/33] tests: acpi: report names of expected files in verbose mode

Message ID 1464256005-75435-1-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov May 26, 2016, 9:46 a.m. UTC 
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>
---
 v2: replace 'for' loop with more readble 'goto'
     Marcel Apfelbaum <marcel@redhat.com>
---
 tests/bios-tables-test.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Marcel Apfelbaum May 30, 2016, 6:14 p.m. UTC | #1 
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 <imammedo@redhat.com>
> ---
>   v2: replace 'for' loop with more readble 'goto'
>       Marcel Apfelbaum <marcel@redhat.com>
> ---
>   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 <marcel@redhat.com>

Thanks,
Marcel
Marcel Apfelbaum June 2, 2016, 11:02 a.m. UTC | #2 
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 <imammedo@redhat.com>
> ---
>   v2: replace 'for' loop with more readble 'goto'
>       Marcel Apfelbaum <marcel@redhat.com>
> ---
>   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 */

:s/extention/extension

>               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 <marcel@redhat.com>

Thanks,
Marcel
diff mbox

Patch

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);