Skip to content

Commit

Permalink
bios-tables-test: default diff command
Browse files Browse the repository at this point in the history
Most people probably just want diff -u. So let's use that
as the default.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
mstsirkin committed Feb 25, 2020
1 parent c01e905 commit 34b1429
Showing 1 changed file with 12 additions and 19 deletions.
31 changes: 12 additions & 19 deletions tests/qtest/bios-tables-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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.");
}
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);
}
}
}
Expand Down

0 comments on commit 34b1429

Please sign in to comment.