pg_regress: Allow overriding diff options

petere · petere · commit 574f7643214d · 2013-01-29T22:59:45.000-05:00
By setting the environment variable PG_REGRESS_DIFF_OPTS, custom diff
options can be passed.

reviewed by Jeevan Chalke
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
@@ -285,7 +285,10 @@ gmake check EXTRA_TESTS=collate.linux.utf8 LANG=en_US.utf8
     file against the reference outputs stored in the
     <filename>src/test/regress/expected</filename> directory.  Any
     differences are saved for your inspection in
-    <filename>src/test/regress/regression.diffs</filename>.  (Or you
+    <filename>src/test/regress/regression.diffs</filename>.  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
     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
@@ -1970,6 +1970,9 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 	 */
 	ifunc();
 
+	if (getenv("PG_REGRESS_DIFF_OPTS"))
+		pretty_diff_opts = getenv("PG_REGRESS_DIFF_OPTS");
+
 	while ((c = getopt_long(argc, argv, "hV", long_options, &option_index)) != -1)
 	{
 		switch (c)

Original file line number	Diff line number	Diff line change
`@@ -1970,6 +1970,9 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`1970`	`1970`	`*/`
`1971`	`1971`	`ifunc();`
`1972`	`1972`
	`1973`	`+ if (getenv("PG_REGRESS_DIFF_OPTS"))`
	`1974`	`+ pretty_diff_opts = getenv("PG_REGRESS_DIFF_OPTS");`
	`1975`	`+`
`1973`	`1976`	`while ((c = getopt_long(argc, argv, "hV", long_options, &option_index)) != -1)`
`1974`	`1977`	`{`
`1975`	`1978`	`switch (c)`