From: Bborie Park <bkpark at ucdavis.edu>
Date: Wed, 24 Apr 2013 15:54:58 +0000 (+0000)
Subject: Added better handling of file paths for msys
X-Git-Tag: 2.1.0beta2~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dff246801dc03d66c7476af15c20eb7ca40f048a;p=postgis

Added better handling of file paths for msys

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

diff --git a/raster/test/regress/rt_addband-pre.pl b/raster/test/regress/rt_addband-pre.pl
index 8a05dd3a0..772877df5 100755
--- a/raster/test/regress/rt_addband-pre.pl
+++ b/raster/test/regress/rt_addband-pre.pl
@@ -5,6 +5,13 @@ my $REGDIR = abs_path(dirname($0));
 my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
 my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
 
+# special handling for msys
+if (lc($^O) eq "msys") {
+	$FILERASTER = `cmd //c echo "$FILERASTER"`;
+	$FILERASTER =~ s/^\s+//;
+	$FILERASTER =~ s/\s+$//;
+}
+
 my $sql = <<"END";
 DROP TABLE IF EXISTS raster_outdb_template;
 CREATE TABLE raster_outdb_template AS
diff --git a/raster/test/regress/rt_addband-pre.sh b/raster/test/regress/rt_addband-pre.sh
index 68770fa6b..6102ed058 100755
--- a/raster/test/regress/rt_addband-pre.sh
+++ b/raster/test/regress/rt_addband-pre.sh
@@ -4,6 +4,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 FILERASTER="$DIR/loader/testraster.tif"
 
+# special handling for msys
+CSYS=`uname -o | tr '[:upper:]' '[:lower:]'`
+if [ "$CSYS" == "msys" ]; then
+	FILERASTER=`cmd //c echo "${FILERASTER}"`
+fi
+
 SQL=" \
 DROP TABLE IF EXISTS raster_outdb_template; \
 CREATE TABLE raster_outdb_template AS \
diff --git a/raster/test/regress/rt_bytea-pre.pl b/raster/test/regress/rt_bytea-pre.pl
index 8a05dd3a0..772877df5 100755
--- a/raster/test/regress/rt_bytea-pre.pl
+++ b/raster/test/regress/rt_bytea-pre.pl
@@ -5,6 +5,13 @@ my $REGDIR = abs_path(dirname($0));
 my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
 my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
 
+# special handling for msys
+if (lc($^O) eq "msys") {
+	$FILERASTER = `cmd //c echo "$FILERASTER"`;
+	$FILERASTER =~ s/^\s+//;
+	$FILERASTER =~ s/\s+$//;
+}
+
 my $sql = <<"END";
 DROP TABLE IF EXISTS raster_outdb_template;
 CREATE TABLE raster_outdb_template AS
diff --git a/raster/test/regress/rt_bytea-pre.sh b/raster/test/regress/rt_bytea-pre.sh
index 68770fa6b..6102ed058 100755
--- a/raster/test/regress/rt_bytea-pre.sh
+++ b/raster/test/regress/rt_bytea-pre.sh
@@ -4,6 +4,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 FILERASTER="$DIR/loader/testraster.tif"
 
+# special handling for msys
+CSYS=`uname -o | tr '[:upper:]' '[:lower:]'`
+if [ "$CSYS" == "msys" ]; then
+	FILERASTER=`cmd //c echo "${FILERASTER}"`
+fi
+
 SQL=" \
 DROP TABLE IF EXISTS raster_outdb_template; \
 CREATE TABLE raster_outdb_template AS \