From 154d3402be71690be7fcae915a7ddcca15f91a17 Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Sat, 25 Feb 2012 19:46:00 +0000
Subject: [PATCH] Compress sed calls into one to make life better for MSYS

git-svn-id: http://svn.osgeo.org/postgis/trunk@9300 b70326c6-7e19-0410-871a-916f4a2858ee
---
 raster/test/regress/run_test.in |  8 ++++----
 regress/run_test                | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/raster/test/regress/run_test.in b/raster/test/regress/run_test.in
index 07799798e..65cadecd9 100644
--- a/raster/test/regress/run_test.in
+++ b/raster/test/regress/run_test.in
@@ -121,10 +121,10 @@ run_simple_test ()
 		| 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}
 
diff --git a/regress/run_test b/regress/run_test
index 856c23952..370b0e8ae 100755
--- a/regress/run_test
+++ b/regress/run_test
@@ -202,7 +202,7 @@ run_simple_test ()
 	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 @@ run_simple_test ()
 		| 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 ?
-- 
2.40.0