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

diff --git a/raster/test/regress/run_test.in b/raster/test/regress/run_test.in
index 07799798e42ed8fae84db7980777c322f87a29f7..65cadecd9f7bdbdb4fa9c8086539356fa0bfbe0e 100644 (file)
--- 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 856c23952802506e32130fb98b3de7588abf0721..370b0e8ae835c6cfc9440cf21208ffb7893359d2 100755 (executable)
--- 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 ?