ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bios-tables-test: fix up DIFF generation 

Turns out it goes to stdout which is suppressed even with V=1.
Force DIFF output to stderr to make it visible.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2020-01-22 02:21:18 -05:00
parent a7b4384fef
commit c01e905f3a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,13 +463,19 @@ static void test_acpi_asl(test_data *data)
"Actual [asl:%s, aml:%s], Expected [asl:%s, aml:%s].\n", "Actual [asl:%s, aml:%s], Expected [asl:%s, aml:%s].\n",
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);
if (getenv("V")) { if (getenv("V")) {
const char *diff_cmd = getenv("DIFF"); const char *diff_cmd = getenv("DIFF");
if (diff_cmd) { if (diff_cmd) {
int ret G_GNUC_UNUSED;
char *diff = g_strdup_printf("%s %s %s", diff_cmd, char *diff = g_strdup_printf("%s %s %s", diff_cmd,
exp_sdt->asl_file, sdt->asl_file); exp_sdt->asl_file, sdt->asl_file);
int out = dup(STDOUT_FILENO);
int ret G_GNUC_UNUSED;
dup2(STDERR_FILENO, STDOUT_FILENO);
ret = system(diff) ; ret = system(diff) ;
dup2(out, STDOUT_FILENO);
close(out);
g_free(diff); g_free(diff);
} else { } else {
fprintf(stderr, "acpi-test: Warning. not showing " fprintf(stderr, "acpi-test: Warning. not showing "