Commit8d97c1d

committed

Use diff's -w switch only on Windows, to avoid problems with inconsistent

newline representations. Per buildfarm results and subsequent discussion.Sync up a couple of other places that had their own policies.

1 parentfe4b8c4 commit8d97c1dCopy full SHA for 8d97c1d

File tree

+15

-14

lines changed

+15

-14

lines changed

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress_ecpg.c,v 1.5 2009/01/01 17:24:02 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress_ecpg.c,v 1.6 2009/11/23 16:02:24 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -161,15 +161,7 @@ ecpg_start_test(const char *testname,`
`161`	`161`	`staticvoid`
`162`	`162`	`ecpg_init(void)`
`163`	`163`	`{`
`164`		`-/* no reason to set -w for ecpg checks, except for when on windows */`
`165`		`-if (strstr(host_platform,"-win32")\|\|strstr(host_platform,"-mingw32"))`
`166`		`-basic_diff_opts="-w";`
`167`		`-else`
`168`		`-basic_diff_opts="";`
`169`		`-if (strstr(host_platform,"-win32")\|\|strstr(host_platform,"-mingw32"))`
`170`		`-pretty_diff_opts="-C3 -w";`
`171`		`-else`
`172`		`-pretty_diff_opts="-C3";`
	`164`	`+/* nothing to do here at the moment */`
`173`	`165`	`}`
`174`	`166`
`175`	`167`	`int`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# $PostgreSQL: pgsql/src/test/mb/mbregress.sh,v 1.10 2009/05/06 16:15:21 tgl Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/test/mb/mbregress.sh,v 1.11 2009/11/23 16:02:24 tgl Exp $`
`3`	`3`
`4`	`4`	`ifecho'\c'\| grep -s c>/dev/null2>&1`
`5`	`5`	`then`
`@@ -49,7 +49,7 @@ do`
`49`	`49`
`50`	`50`	if [`diff${EXPECTED} results/${i}.out\| wc -l`-ne 0 ]
`51`	`51`	`then`
`52`		`-( diff -wC3${EXPECTED} results/${i}.out; \`
	`52`	`+( diff -C3${EXPECTED} results/${i}.out; \`
`53`	`53`	`echo""; \`
`54`	`54`	`echo"----------------------"; \`
`55`	`55`	`echo"" )>> regression.diffs`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.66 2009/11/22 17:54:23 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.67 2009/11/23 16:02:24 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -65,9 +65,18 @@ static char *makeprog = MAKEPROG;`
`65`	`65`	`staticchar*shellprog=SHELLPROG;`
`66`	`66`	`#endif`
`67`	`67`
`68`		`-/* currently we can use the same diff switches on all platforms */`
	`68`	`+/*`
	`69`	`+ * On Windows we use -w in diff switches to avoid problems with inconsistent`
	`70`	`+ * newline representation. The actual result files will generally have`
	`71`	`+ * Windows-style newlines, but the comparison files might or might not.`
	`72`	`+ */`
	`73`	`+#ifndefWIN32`
`69`	`74`	`constchar*basic_diff_opts="";`
`70`	`75`	`constchar*pretty_diff_opts="-C3";`
	`76`	`+#else`
	`77`	`+constchar*basic_diff_opts="-w";`
	`78`	`+constchar*pretty_diff_opts="-w -C3";`
	`79`	`+#endif`
`71`	`80`
`72`	`81`	`/* options settable from command line */`
`73`	`82`	`_stringlist*dblist=NULL;`

Comments

(0)