From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 May 2013 07:03:21 +0000 (+0000)
Subject: Use system diff only if it knows how to strip trailing CR (#2344)
X-Git-Tag: 2.1.0beta3~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d894dc7e94adf589ff37d409581d6f804a4bd07;p=postgis

Use system diff only if it knows how to strip trailing CR (#2344)

git-svn-id: http://svn.osgeo.org/postgis/trunk@11502 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 99e803f86..467589d8c 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -35,7 +35,7 @@ our $REGDIR = abs_path(dirname($0));
 our $SHP2PGSQL = $REGDIR . "/../loader/shp2pgsql";
 our $PGSQL2SHP = $REGDIR . "/../loader/pgsql2shp";
 our $RASTER2PGSQL = $REGDIR . "/../raster/loader/raster2pgsql";
-our $sysdiff = `which diff 2>/dev/null`;
+our $sysdiff = !system("diff --strip-trailing-cr $0 $0 2> /dev/null");
 
 ##################################################################
 # Parse command line opts