On Sun, Dec 29, 2013 at 2:29 AM, Amit Kapila <amit.kapil...@gmail.com>wrote:
> On Thu, Dec 26, 2013 at 3:02 PM, David Rowley <dgrowle...@gmail.com> > wrote: > > In the following thread I discovered that my new regression tests worked > > perfectly on windows, but when they were run on linux they failed. > > > > > http://www.postgresql.org/message-id/CAApHDvo_YCiPYGDz07MpX9o6EGg=3mmyJTb0ysPTwoTg3c=t...@mail.gmail.com > > > > After looking at pg_regress to see which options it passes to diff I > > discovered that it passes -w on windows to ignore ALL white space. > > > > The attached simple patch changes this so that it only ignores carriage > > returns. It does this by passing --strip-trailing-cr to diff instead of > -w. > > This should help us few developers who use windows to get our white space > > correct in out expected results so that the tests also pass on non > windows > > platforms. > > > > I also faced some similar issue few days back and tried to search a > bit for some simpler option, but couldn't spend too much time. > I think it would be good if we can make it work without -w option. > > When I tried with your patch on windows, it results into following: > > ============== running regression test queries ============== > test tablespace ... diff: unrecognized option > `--strip-trailing-cr > ' > diff: Try `diff --help' for more information. > diff command failed with status 2: "diff --strip-trailing-cr > "e:/../postgresql/src/test/regress/expected/tablespace.out" > "e:/../postgresql/src/test/regress/results/tablespace.out" > > "e:/../postgresql/src/test/regress/results/tablespace.out.diff" > " > > Which version of diff you are using? > > Version of diff on my m/c is: > diff - GNU diffutils version 2.7 > > I had a bit of a look around on the git repository for diffutils and I've found at least part of the commit which introduced --strip-trailing-cr http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=eefb9adae1642dcb0e2ac523c79998f466e94e77 Although here I can only see that they've added the command line args and not the actual code which implements stripping the carriage returns. Going by that it seems that was added back in 2001, but the version you're using is a bit older than than, it seems 2.7 is 19 years old! http://git.savannah.gnu.org/cgit/diffutils.git/refs/tags I'm on 2.8.7 which is only 4 years old. I know we don't normally go with bleeding edge, but I wondering if we could make the minimum supported diff version at least 2.8 (at least for windows) which was released in 2002. Regards David Rowley > With Regards, > Amit Kapila. > EnterpriseDB: http://www.enterprisedb.com >
