diff options
| author | Peter Eisentraut | 2019-01-02 20:24:51 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2019-02-15 14:09:50 +0000 |
| commit | 8f27a14b1bd3d906144356ce19e33a2fd0095141 (patch) | |
| tree | d9ca409e5186a7366783c8657594927194aadf8f | |
| parent | 331a613e9d363febfee8508e8de545fd84624758 (diff) | |
Use standard diff separator for regression.diffs
Instead of ======..., use the standard separator for a multi-file
diff, which is, per POSIX,
"diff %s %s %s\n", <diff_options>, <filename1>, <filename2>
This makes regression.diffs behave more like a proper diff file, for
use with other tools. And it shows the diff options used, for
clarity.
Discussion: https://www.postgresql.org/message-id/[email protected]
| -rw-r--r-- | src/test/regress/pg_regress.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index a4caa228e28..10111ebfb91 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -1454,20 +1454,23 @@ results_differ(const char *testname, const char *resultsfile, const char *defaul * Use the best comparison file to generate the "pretty" diff, which we * append to the diffs summary file. */ - snprintf(cmd, sizeof(cmd), - "diff %s \"%s\" \"%s\" >> \"%s\"", - pretty_diff_opts, best_expect_file, resultsfile, difffilename); - run_diff(cmd, difffilename); - /* And append a separator */ + /* Write diff header */ difffile = fopen(difffilename, "a"); if (difffile) { fprintf(difffile, - "\n======================================================================\n\n"); + "diff %s %s %s\n", + pretty_diff_opts, best_expect_file, resultsfile); fclose(difffile); } + /* Run diff */ + snprintf(cmd, sizeof(cmd), + "diff %s \"%s\" \"%s\" >> \"%s\"", + pretty_diff_opts, best_expect_file, resultsfile, difffilename); + run_diff(cmd, difffilename); + unlink(diff); return true; } |