NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8f27a14

committed

Use standard diff separator for regression.diffs

Instead of ======..., use the standard separator for a multi-filediff, which is, per POSIX, "diff %s %s %s\n", <diff_options>, <filename1>, <filename2>This makes regression.diffs behave more like a proper diff file, foruse with other tools. And it shows the diff options used, forclarity.Discussion:https://www.postgresql.org/message-id/70440c81-37bb-76dd-e48b-b5a9550d5613@2ndquadrant.com

1 parent331a613 commit8f27a14Copy full SHA for 8f27a14

File tree

1 file changed

-6

lines changed

src/test/regress
- pg_regress.c

1 file changed

-6

lines changed

`‎src/test/regress/pg_regress.c`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1454,20 +1454,23 @@ results_differ(const char testname, const char resultsfile, const char *defaul`
`1454`	`1454`	`* Use the best comparison file to generate the "pretty" diff, which we`
`1455`	`1455`	`* append to the diffs summary file.`
`1456`	`1456`	`*/`
`1457`		`-snprintf(cmd,sizeof(cmd),`
`1458`		`-"diff %s \"%s\" \"%s\" >> \"%s\"",`
`1459`		`-pretty_diff_opts,best_expect_file,resultsfile,difffilename);`
`1460`		`-run_diff(cmd,difffilename);`
`1461`	`1457`
`1462`		`-/And append a separator /`
	`1458`	`+/Write diff header /`
`1463`	`1459`	`difffile=fopen(difffilename,"a");`
`1464`	`1460`	`if (difffile)`
`1465`	`1461`	`{`
`1466`	`1462`	`fprintf(difffile,`
`1467`		`-"\n======================================================================\n\n");`
	`1463`	`+"diff %s %s %s\n",`
	`1464`	`+pretty_diff_opts,best_expect_file,resultsfile);`
`1468`	`1465`	`fclose(difffile);`
`1469`	`1466`	`}`
`1470`	`1467`
	`1468`	`+/* Run diff */`
	`1469`	`+snprintf(cmd,sizeof(cmd),`
	`1470`	`+"diff %s \"%s\" \"%s\" >> \"%s\"",`
	`1471`	`+pretty_diff_opts,best_expect_file,resultsfile,difffilename);`
	`1472`	`+run_diff(cmd,difffilename);`
	`1473`	`+`
`1471`	`1474`	`unlink(diff);`
`1472`	`1475`	`return true;`
`1473`	`1476`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8f27a14

File tree

1 file changed

1 file changed

`‎src/test/regress/pg_regress.c`

0 commit comments