tests/bios-tables-test: Sanitize test verbose output
diff mbox series

Message ID 20181030001841.1658-1-philmd@redhat.com
State New
Headers show
Series
  • tests/bios-tables-test: Sanitize test verbose output
Related show

Commit Message

Philippe Mathieu-Daudé Oct. 30, 2018, 12:18 a.m. UTC
Fix the extraneous extra blank lines in the test output when running with V=1.

Before:

    TEST: tests/bios-tables-test... (pid=25678)
      /i386/acpi/piix4:
    Looking for expected file 'tests/acpi-test-data/pc/DSDT'

    Using expected file 'tests/acpi-test-data/pc/DSDT'

    Looking for expected file 'tests/acpi-test-data/pc/FACP'

    Using expected file 'tests/acpi-test-data/pc/FACP'

    Looking for expected file 'tests/acpi-test-data/pc/APIC'

    Using expected file 'tests/acpi-test-data/pc/APIC'

    Looking for expected file 'tests/acpi-test-data/pc/HPET'

    Using expected file 'tests/acpi-test-data/pc/HPET'
    OK

After:

    TEST: tests/bios-tables-test... (pid=667)
      /i386/acpi/piix4:
    Looking for expected file 'tests/acpi-test-data/pc/DSDT'
    Using expected file 'tests/acpi-test-data/pc/DSDT'
    Looking for expected file 'tests/acpi-test-data/pc/FACP'
    Using expected file 'tests/acpi-test-data/pc/FACP'
    Looking for expected file 'tests/acpi-test-data/pc/APIC'
    Using expected file 'tests/acpi-test-data/pc/APIC'
    Looking for expected file 'tests/acpi-test-data/pc/HPET'
    Using expected file 'tests/acpi-test-data/pc/HPET'
    OK

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/bios-tables-test.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Igor Mammedov Nov. 1, 2018, 10:04 a.m. UTC | #1
On Tue, 30 Oct 2018 01:18:40 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> Fix the extraneous extra blank lines in the test output when running with V=1.
> 
> Before:
> 
>     TEST: tests/bios-tables-test... (pid=25678)
>       /i386/acpi/piix4:
>     Looking for expected file 'tests/acpi-test-data/pc/DSDT'
> 
>     Using expected file 'tests/acpi-test-data/pc/DSDT'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/FACP'
> 
>     Using expected file 'tests/acpi-test-data/pc/FACP'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/APIC'
> 
>     Using expected file 'tests/acpi-test-data/pc/APIC'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/HPET'
> 
>     Using expected file 'tests/acpi-test-data/pc/HPET'
>     OK
> 
> After:
> 
>     TEST: tests/bios-tables-test... (pid=667)
>       /i386/acpi/piix4:
>     Looking for expected file 'tests/acpi-test-data/pc/DSDT'
>     Using expected file 'tests/acpi-test-data/pc/DSDT'
>     Looking for expected file 'tests/acpi-test-data/pc/FACP'
>     Using expected file 'tests/acpi-test-data/pc/FACP'
>     Looking for expected file 'tests/acpi-test-data/pc/APIC'
>     Using expected file 'tests/acpi-test-data/pc/APIC'
>     Looking for expected file 'tests/acpi-test-data/pc/HPET'
>     Using expected file 'tests/acpi-test-data/pc/HPET'
>     OK
> 
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/bios-tables-test.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 4e24930c4b..02dd48de0d 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -371,6 +371,9 @@ static GArray *load_expected_aml(test_data *data)
>      gboolean ret;
>  
>      GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> +    if (getenv("V")) {
> +        fputc('\n', stderr);
> +    }
>      for (i = 0; i < data->tables->len; ++i) {
>          AcpiSdtTable exp_sdt;
>          gchar *aml_file = NULL;
> @@ -385,7 +388,7 @@ try_again:
>          aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
>                                     (gchar *)&sdt->header.signature, ext);
>          if (getenv("V")) {
> -            fprintf(stderr, "\nLooking for expected file '%s'\n", aml_file);
> +            fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
>          }
>          if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
>              exp_sdt.aml_file = aml_file;
> @@ -397,7 +400,7 @@ try_again:
>          }
>          g_assert(exp_sdt.aml_file);
>          if (getenv("V")) {
> -            fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
> +            fprintf(stderr, "Using expected file '%s'\n", aml_file);
>          }
>          ret = g_file_get_contents(aml_file, &exp_sdt.aml,
>                                    &exp_sdt.aml_len, &error);
Eric Blake Nov. 1, 2018, 2:26 p.m. UTC | #2
On 10/29/18 7:18 PM, Philippe Mathieu-Daudé wrote:
> Fix the extraneous extra blank lines in the test output when running with V=1.
> 

> +++ b/tests/bios-tables-test.c
> @@ -371,6 +371,9 @@ static GArray *load_expected_aml(test_data *data)
>       gboolean ret;
>   
>       GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> +    if (getenv("V")) {
> +        fputc('\n', stderr);
> +    }

Umm, this prints a blank line even if I run 'make check V=0' - do we 
support V=0 as a way to disable verbosity, in which case you need to 
actually inspect the contents of $V rather than just assuming that if it 
is in the environment things are verbose?

> @@ -397,7 +400,7 @@ try_again:
>           }
>           g_assert(exp_sdt.aml_file);
>           if (getenv("V")) {
> -            fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
> +            fprintf(stderr, "Using expected file '%s'\n", aml_file);

But that's a pre-existing question, so it doesn't affect this particular 
patch.
Peter Maydell Nov. 1, 2018, 2:30 p.m. UTC | #3
On 1 November 2018 at 14:26, Eric Blake <eblake@redhat.com> wrote:
> Umm, this prints a blank line even if I run 'make check V=0' - do we support
> V=0 as a way to disable verbosity

Empirically, we do not. Our rules.make defines
quiet-command = $(if $(V),$1,$(if $(2),@printf "  %-7s %s\n" $2 $3 && $1, @$1))

which will suppress the verbose printing of command lines
only if $(V) expands to the empty string, so V=0 will
print verbosely here too.

thanks
-- PMM
Thomas Huth Nov. 2, 2018, 10:03 p.m. UTC | #4
On 2018-10-30 00:18, Philippe Mathieu-Daudé wrote:
> Fix the extraneous extra blank lines in the test output when running with V=1.
> 
> Before:
> 
>     TEST: tests/bios-tables-test... (pid=25678)
>       /i386/acpi/piix4:
>     Looking for expected file 'tests/acpi-test-data/pc/DSDT'
> 
>     Using expected file 'tests/acpi-test-data/pc/DSDT'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/FACP'
> 
>     Using expected file 'tests/acpi-test-data/pc/FACP'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/APIC'
> 
>     Using expected file 'tests/acpi-test-data/pc/APIC'
> 
>     Looking for expected file 'tests/acpi-test-data/pc/HPET'
> 
>     Using expected file 'tests/acpi-test-data/pc/HPET'
>     OK
> 
> After:
> 
>     TEST: tests/bios-tables-test... (pid=667)
>       /i386/acpi/piix4:
>     Looking for expected file 'tests/acpi-test-data/pc/DSDT'
>     Using expected file 'tests/acpi-test-data/pc/DSDT'
>     Looking for expected file 'tests/acpi-test-data/pc/FACP'
>     Using expected file 'tests/acpi-test-data/pc/FACP'
>     Looking for expected file 'tests/acpi-test-data/pc/APIC'
>     Using expected file 'tests/acpi-test-data/pc/APIC'
>     Looking for expected file 'tests/acpi-test-data/pc/HPET'
>     Using expected file 'tests/acpi-test-data/pc/HPET'
>     OK
> 
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/bios-tables-test.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 4e24930c4b..02dd48de0d 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -371,6 +371,9 @@ static GArray *load_expected_aml(test_data *data)
>      gboolean ret;
>  
>      GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
> +    if (getenv("V")) {
> +        fputc('\n', stderr);
> +    }
>      for (i = 0; i < data->tables->len; ++i) {
>          AcpiSdtTable exp_sdt;
>          gchar *aml_file = NULL;
> @@ -385,7 +388,7 @@ try_again:
>          aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
>                                     (gchar *)&sdt->header.signature, ext);
>          if (getenv("V")) {
> -            fprintf(stderr, "\nLooking for expected file '%s'\n", aml_file);
> +            fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
>          }
>          if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
>              exp_sdt.aml_file = aml_file;
> @@ -397,7 +400,7 @@ try_again:
>          }
>          g_assert(exp_sdt.aml_file);
>          if (getenv("V")) {
> -            fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
> +            fprintf(stderr, "Using expected file '%s'\n", aml_file);
>          }
>          ret = g_file_get_contents(aml_file, &exp_sdt.aml,
>                                    &exp_sdt.aml_len, &error);
> 

Could we please get rid of the getenv + fprintf here and use
g_test_message() instead, like we already do in most of the other tests
that want to log additional output?

  Thomas

Patch
diff mbox series

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 4e24930c4b..02dd48de0d 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -371,6 +371,9 @@  static GArray *load_expected_aml(test_data *data)
     gboolean ret;
 
     GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
+    if (getenv("V")) {
+        fputc('\n', stderr);
+    }
     for (i = 0; i < data->tables->len; ++i) {
         AcpiSdtTable exp_sdt;
         gchar *aml_file = NULL;
@@ -385,7 +388,7 @@  try_again:
         aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
                                    (gchar *)&sdt->header.signature, ext);
         if (getenv("V")) {
-            fprintf(stderr, "\nLooking for expected file '%s'\n", aml_file);
+            fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
         }
         if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
             exp_sdt.aml_file = aml_file;
@@ -397,7 +400,7 @@  try_again:
         }
         g_assert(exp_sdt.aml_file);
         if (getenv("V")) {
-            fprintf(stderr, "\nUsing expected file '%s'\n", aml_file);
+            fprintf(stderr, "Using expected file '%s'\n", aml_file);
         }
         ret = g_file_get_contents(aml_file, &exp_sdt.aml,
                                   &exp_sdt.aml_len, &error);