OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/qtest/bios-tables-test: Make the test less verbose by default

Browse Source 
We are facing the issues that our test logs in the gitlab CI are
too big (and thus cut off). The bios-tables-test is one of the few
qtests that prints many lines of output by default when running with
V=1, so it contributes to this problem. Almost all other qtests are
silent with V=1 and only print debug messages with V=2 and higher.
Thus let's change the bios-tables-test to behave more like the
other tests and only print the debug messages with V=2 (or higher).

Message-Id: <20230118125132.1694469-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-01-18 13:51:32 +01:00
parent e549227408
commit a8fe0757e1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/qtest/bios-tables-test.c
View File

@ -24,7 +24,7 @@
* You will also notice that tests/qtest/bios-tables-test-allowed-diff.h lists * You will also notice that tests/qtest/bios-tables-test-allowed-diff.h lists
* a bunch of files. This is your hint that you need to do the below: * a bunch of files. This is your hint that you need to do the below:
* 4. Run * 4. Run
* make check V=1 * make check V=2
* this will produce a bunch of warnings about differences * this will produce a bunch of warnings about differences
* beween actual and expected ACPI tables. If you have IASL installed, * beween actual and expected ACPI tables. If you have IASL installed,
* they will also be disassembled so you can look at the disassembled * they will also be disassembled so you can look at the disassembled
@ -108,6 +108,8 @@ static const char *iasl = CONFIG_IASL;
static const char *iasl; static const char *iasl;
#endif #endif
static int verbosity_level;
static bool compare_signature(const AcpiSdtTable *sdt, const char *signature) static bool compare_signature(const AcpiSdtTable *sdt, const char *signature)
{ {
return !memcmp(sdt->aml, signature, 4); return !memcmp(sdt->aml, signature, 4);
@ -368,7 +370,7 @@ static GArray *load_expected_aml(test_data *data)
gsize aml_len; gsize aml_len;
GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable)); GArray *exp_tables = g_array_new(false, true, sizeof(AcpiSdtTable));
if (getenv("V")) { if (verbosity_level >= 2) {
fputc('\n', stderr); fputc('\n', stderr);
} }
for (i = 0; i < data->tables->len; ++i) { for (i = 0; i < data->tables->len; ++i) {
@ -383,7 +385,7 @@ static GArray *load_expected_aml(test_data *data)
try_again: try_again:
aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
sdt->aml, ext); sdt->aml, ext);
if (getenv("V")) { if (verbosity_level >= 2) {
fprintf(stderr, "Looking 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)) { if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
@ -395,7 +397,7 @@ try_again:
goto try_again; goto try_again;
} }
g_assert(exp_sdt.aml_file); g_assert(exp_sdt.aml_file);
if (getenv("V")) { if (verbosity_level >= 2) {
fprintf(stderr, "Using expected file '%s'\n", aml_file); fprintf(stderr, "Using expected file '%s'\n", aml_file);
} }
ret = g_file_get_contents(aml_file, (gchar **)&exp_sdt.aml, ret = g_file_get_contents(aml_file, (gchar **)&exp_sdt.aml,
@ -503,7 +505,7 @@ static void test_acpi_asl(test_data *data)
exp_sdt->aml, sdt->asl_file, sdt->aml_file, exp_sdt->aml, sdt->asl_file, sdt->aml_file,
exp_sdt->asl_file, exp_sdt->aml_file); exp_sdt->asl_file, exp_sdt->aml_file);
fflush(stderr); fflush(stderr);
if (getenv("V")) { if (verbosity_level >= 1) {
const char *diff_env = getenv("DIFF"); const char *diff_env = getenv("DIFF");
const char *diff_cmd = diff_env ? diff_env : "diff -U 16"; const char *diff_cmd = diff_env ? diff_env : "diff -U 16";
char *diff = g_strdup_printf("%s %s %s", diff_cmd, char *diff = g_strdup_printf("%s %s %s", diff_cmd,
@ -1974,8 +1976,13 @@ int main(int argc, char *argv[])
const char *arch = qtest_get_arch(); const char *arch = qtest_get_arch();
const bool has_kvm = qtest_has_accel("kvm"); const bool has_kvm = qtest_has_accel("kvm");
const bool has_tcg = qtest_has_accel("tcg"); const bool has_tcg = qtest_has_accel("tcg");
char *v_env = getenv("V");
int ret; int ret;
if (v_env) {
verbosity_level = atoi(v_env);
}
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {