[postgis-devel] [postgis-commits] r9300 - in trunk: raster/test/regress regress

[dustymugs]

B
-----Original Message-----
From: SVN commit notifications for PostGIS
	<postgis-commits at postgis.refractions.net>
Sender: postgis-commits-bounces at postgis.refractions.net
Date: Sat, 25 Feb 2012 11:46:00 
To: <postgis-commits at postgis.refractions.net>
Reply-To: postgis-devel at postgis.refractions.net
Subject: [postgis-commits] r9300 - in trunk: raster/test/regress regress

Author: pramsey
Date: 2012-02-25 11:46:00 -0800 (Sat, 25 Feb 2012)
New Revision: 9300

Modified:
   trunk/raster/test/regress/run_test.in
   trunk/regress/run_test
Log:
Compress sed calls into one to make life better for MSYS


Modified: trunk/raster/test/regress/run_test.in
===================================================================
--- trunk/raster/test/regress/run_test.in	2012-02-25 17:10:23 UTC (rev 9299)
+++ trunk/raster/test/regress/run_test.in	2012-02-25 19:46:00 UTC (rev 9300)
@@ -121,10 +121,10 @@
 		| grep -v "^DROP" \
 		| grep -v "^CREATE" \
 		| grep -v "^SET" \
-		| sed 's/Infinity/inf/g;s/Inf/inf/g;s/1\.#INF/inf/g' \
-		| sed 's/[eE]\([+-]\)0\{1,\}\([0-9]\{1,\}\)/e\1\2/g' \
-		| sed 's/Self-intersection .*/Self-intersection/' \
-		| sed 's/^ROLLBACK/COMMIT/' \
+		| sed -e 's/Infinity/inf/g' -e 's/Inf/inf/g' -e 's/1\.#INF/inf/g' \
+		      -e 's/[eE]\([+-]\)0\{1,\}\([0-9]\{1,\}\)/e\1\2/g' \
+		      -e 's/Self-intersection .*/Self-intersection/' \
+		      -e 's/^ROLLBACK/COMMIT/' \
 		> "${OUTFILE}"
 	rm ${TMPFILE}
 

Modified: trunk/regress/run_test
===================================================================
--- trunk/regress/run_test	2012-02-25 17:10:23 UTC (rev 9299)
+++ trunk/regress/run_test	2012-02-25 19:46:00 UTC (rev 9300)
@@ -202,7 +202,7 @@
 	mkdir -p "${BETMPDIR}"
 	chmod 777 "${BETMPDIR}"
 
-	# Use intermediate file to prevent MingW buffering problems
+	# Use only one call to sed to work around MSYS buffering problem
 	${PSQL} -v "VERBOSITY=terse" -v "tmpfile='${TMPFILE}'" -tXA < "${_sql}" ${DB} 2>&1 \
 		| grep --binary-files=text -v "^$" \
 		| grep --binary-files=text -v "^INSERT" \
@@ -218,10 +218,10 @@
 		| grep --binary-files=text -v "^TRUNCATE" \
 		| grep --binary-files=text -v "^LINE [0-9]" \
 		| grep --binary-files=text -v "^  *^$" \
-		| sed 's/Infinity/inf/g;s/Inf/inf/g;s/1\.#INF/inf/g' \
-		| sed 's/[eE]\([+-]\)0\{1,\}\([0-9]\{1,\}\)/e\1\2/g' \
-		| sed 's/Self-intersection .*/Self-intersection/' \
-		| sed 's/^ROLLBACK/COMMIT/' \
+		| sed -e 's/Infinity/inf/g' -e 's/Inf/inf/g' -e 's/1\.#INF/inf/g' \
+		      -e 's/[eE]\([+-]\)0\{1,\}\([0-9]\{1,\}\)/e\1\2/g' \
+		      -e 's/Self-intersection .*/Self-intersection/' \
+		      -e 's/^ROLLBACK/COMMIT/' \
 		> "${OUTFILE}"
 
 	rm -rf "${BETMPDIR}" # should we keep these ?

_______________________________________________
postgis-commits mailing list
postgis-commits at postgis.refractions.net
http://lists.refractions.net/mailman/listinfo/postgis-commits