Commit fe17cca6 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Thomas Huth
Browse files

tests/bios-tables-test: Sanitize test verbose output 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent da15af64

tests/bios-tables-test.c

+5 −2
Original line number Diff line number Diff line
@@ -372,6 +372,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;
@@ -386,7 +389,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;
@@ -398,7 +401,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);