Skip to content

Commit e8d76fa

Browse files
authored
Show regression diffs in unified format (#126)
pg_regress did that switch in 2019 (commit acfe1392ef).
1 parent a0d5cd5 commit e8d76fa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/runsuite.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ runtest(const char *binname, const char *testname, int testno, const char *input
199199
const char *cmd;
200200
};
201201
static const struct diff_info diffi[] = {
202-
{ "diff", "diff -c --strip-trailing-cr \"%s\" \"%s\" %s" } // cygwin etc
202+
{ "diff", "diff -u --strip-trailing-cr \"%s\" \"%s\" %s" } // cygwin etc
203203
, { "git", "git diff --no-index -w \"%s\" \"%s\" %s" } // git bash for Windows
204-
, { "wsl", "wsl diff -c --strip-trailing-cr \"`wslpath '%s'`\" \"`wslpath '%s'`\" %s" } // WSL
204+
, { "wsl", "wsl diff -u --strip-trailing-cr \"`wslpath '%s'`\" \"`wslpath '%s'`\" %s" } // WSL
205205
, { "fc", "fc /N \"%s\" \"%s\" %s" }
206206
};
207207
#endif /* WIN32 */
@@ -224,7 +224,7 @@ call_diff(const char *inputdir, const char *expected_dir, const char *testname,
224224
return -1;
225225
snprintf(cmdline, sizeof(cmdline), exec_diffpgm, file1, file2, outspec);
226226
#else
227-
snprintf(cmdline, sizeof(cmdline), "diff -C3 %s %s %s", file1, file2, outspec);
227+
snprintf(cmdline, sizeof(cmdline), "diff -u %s %s %s", file1, file2, outspec);
228228
#endif /* WIN32 */
229229
if ((diff_rtn = system(cmdline)) == -1)
230230
printf("# diff failed\n");

0 commit comments

Comments
 (0)