mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bios-tables-test: default diff command

Browse Source 
Most people probably just want diff -u. So let's use that
as the default.

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

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

@ -465,25 +465,18 @@ static void test_acpi_asl(test_data *data)
exp_sdt->asl_file, exp_sdt->aml_file);
fflush(stderr);
if (getenv("V")) {
const char *diff_cmd = getenv("DIFF");
if (diff_cmd) {
char *diff = g_strdup_printf("%s %s %s", diff_cmd,
exp_sdt->asl_file, sdt->asl_file);
int out = dup(STDOUT_FILENO);
int ret G_GNUC_UNUSED;
const char *diff_env = getenv("DIFF");
const char *diff_cmd = diff_env ? diff_env : "diff -u";
char *diff = g_strdup_printf("%s %s %s", diff_cmd,
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) ;
dup2(out, STDOUT_FILENO);
close(out);
g_free(diff);
} else {
fprintf(stderr, "acpi-test: Warning. not showing "
"difference since no diff utility is specified. "
"Set 'DIFF' environment variable to a preferred "
"diff utility and run 'make V=1 check' again to "
"see ASL difference.");
}
dup2(STDERR_FILENO, STDOUT_FILENO);
ret = system(diff) ;
dup2(out, STDOUT_FILENO);
close(out);
g_free(diff);
}
}
}