used a consistent construct for out_and_err redirect,

added rule to make [eE][-+]0+[0-9]+ become e[-+][1-9]+

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

diff --git a/regress/regress_expected b/regress/regress_expected
index 5b2dc999ccc36edeed3b03107a5c6bdcc9025bf5..354b617c90c2a1811f68351780d757073e9d036f 100644 (file)
--- a/regress/regress_expected
+++ b/regress/regress_expected
@@ -45,7 +45,7 @@
 45|GEOMETRYCOLLECTION(MULTILINESTRING((0 0 0,1 1 0,2 2 0,3 3 0,4 4 0)),POINT(1 2 3))
 46|GEOMETRYCOLLECTION(POINT(1 2 3),MULTIPOLYGON(((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0)),((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(5 5 0,7 5 0,7 7 0,5 7 0,5 5 0)),((0 0 1,10 0 1,10 10 1,0 10 1,0 0 1),(5 5 1,7 5 1,7 7 1,5 7 1,5 5 1),(1 1 1,2 1 1,2 2 1,1 2 1,1 1 1))))
 47|GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0)),((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(5 5 0,7 5 0,7 7 0,5 7 0,5 5 0)),((0 0 1,10 0 1,10 10 1,0 10 1,0 0 1),(5 5 1,7 5 1,7 7 1,5 7 1,5 5 1),(1 1 1,2 1 1,2 2 1,1 2 1,1 1 1))),MULTILINESTRING((0 0 0,1 1 0,2 2 0,3 3 0,4 4 0),(0 0 0,1 1 0,2 2 0,3 3 0,4 4 0),(1 2 3,4 5 6,7 8 9,10 11 12,13 14 15)),MULTIPOINT(1 2 3,5 6 7,8 9 10,11 12 13))
-48|MULTIPOINT(-1 -2 -3,5.4 6.6 7.77,-5.4 -6.6 -7.77,1000000 1e-06 -1000000,-1.3e-06 -1.4e-05 0)
+48|MULTIPOINT(-1 -2 -3,5.4 6.6 7.77,-5.4 -6.6 -7.77,1000000 1e-6 -1000000,-1.3e-6 -1.4e-5 0)
 49|GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))
 ERROR:  parse error - invalid geometry
 ERROR:  parse error - invalid geometry

diff --git a/regress/run_test b/regress/run_test
index 6522dc5198da941f18024b80d0104ccdcb457bd9..c5fd9cfac9922109fe7e3454a67c8f43072da70c 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -98,7 +98,7 @@ while [ -n "$1" ]; do
        fi
 
        # Use intermediate file to prevent MingW buffering problems
-       psql -tA < "${TEST}.sql" $DB 2>&1 &> ${TMPFILE}
+       psql -tA < "${TEST}.sql" $DB > ${TMPFILE} 2>&1
        cat ${TMPFILE} \
                | grep -v "^$" \
                | grep -v "^INSERT" \
@@ -107,6 +107,7 @@ while [ -n "$1" ]; do
                | grep -v "^CREATE" \
                | grep -v "^SET" \
                | sed 's/Infinity/inf/g;s/Inf/inf/g;s/1\.#INF/inf/g' \
+               | sed 's/[eE]\([+-]\)0\+\([0-9]\+\)/e\1\2/g' \
                > "${OUTFILE}"
        rm ${TMPFILE}