diff options
| author | Peter Eisentraut | 2019-01-02 20:20:53 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2019-01-02 20:20:53 +0000 |
| commit | acfe1392eff2f96ef7931068b11b2d58196f4d95 (patch) | |
| tree | 0cead8e3b006a3973614ddf8e7f85da3d8bd268d | |
| parent | 69ae9dcb444a667533344562f134444856fb3414 (diff) | |
Switch pg_regress to output unified diffs by default
Author: Christoph Berg <myon@debian.org>
Discussion: https://www.postgresql.org/message-id/flat/20170406223103.ixihdedf6d6d4kbk@alap3.anarazel.de/
| -rw-r--r-- | doc/src/sgml/regress.sgml | 2 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml index 673a8c21642..749d1a384bb 100644 --- a/doc/src/sgml/regress.sgml +++ b/doc/src/sgml/regress.sgml @@ -410,7 +410,7 @@ make standbycheck If you don't like the <command>diff</command> options that are used by default, set the environment variable <envar>PG_REGRESS_DIFF_OPTS</envar>, for - instance <literal>PG_REGRESS_DIFF_OPTS='-u'</literal>. (Or you + instance <literal>PG_REGRESS_DIFF_OPTS='-c'</literal>. (Or you can run <command>diff</command> yourself, if you prefer.) </para> diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 3c360d16352..d4f04a8a2c6 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -62,10 +62,10 @@ static char *shellprog = SHELLPROG; */ #ifndef WIN32 const char *basic_diff_opts = ""; -const char *pretty_diff_opts = "-C3"; +const char *pretty_diff_opts = "-U3"; #else const char *basic_diff_opts = "-w"; -const char *pretty_diff_opts = "-w -C3"; +const char *pretty_diff_opts = "-w -U3"; #endif /* options settable from command line */ |