database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00
Code

Use standard diff separator for regression.diffs

Browse Source 
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/70440c81-37bb-76dd-e48b-b5a9550d5613@2ndquadrant.com
This commit is contained in:
Peter Eisentraut 2019-01-02 21:24:51 +01:00
parent 331a613e9d
commit 8f27a14b1b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/regress/pg_regress.c
View File

@ -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 * Use the best comparison file to generate the "pretty" diff, which we
* append to the diffs summary file. * 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"); difffile = fopen(difffilename, "a");
if (difffile) if (difffile)
{ {
fprintf(difffile, fprintf(difffile,
"\n======================================================================\n\n"); "diff %s %s %s\n",
pretty_diff_opts, best_expect_file, resultsfile);
fclose(difffile); 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); unlink(diff);
return true; return true;
} }