First regress test cleaned up.

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

diff --git a/lwgeom/regress/lwgeom_regress.sql b/lwgeom/regress/lwgeom_regress.sql
index 994cb8f5ecd6ee0ab2cbb150f6ff7295c1789a16..205492f90f7c5fc315bdca17340dd421ec61d774 100644 (file)
--- a/lwgeom/regress/lwgeom_regress.sql
+++ b/lwgeom/regress/lwgeom_regress.sql
@@ -1,8 +1,8 @@
 CREATE TABLE test_data (
     id integer,
     wkt text,
-    wkb_xdr wkb,
-    wkb_ndr wkb
+    wkb_xdr text,
+    wkb_ndr text
 );
 
 
@@ -84,9 +84,9 @@ INSERT INTO test_data VALUES (-13, 'POLYGON((0 0.1 -0.01,0.2 10.3 -0.02,10.4 10.
 
 
 SELECT id,wkt FROM test_data WHERE
-       asText(lwgeom(wkt)) != wkt  OR
-       asText(lwgeom(wkb_xdr)) != wkt OR 
-       asText(lwgeom(wkb_ndr)) != wkt OR
-       ( (asBinary(lwgeom(wkb_ndr)) != wkb_ndr) AND (asBinary(lwgeom(wkb_ndr)) != wkb_xdr)  )  OR
-       ( (asBinary(lwgeom(wkb_xdr)) != wkb_ndr) AND (asBinary(lwgeom(wkb_xdr)) != wkb_xdr)  ) 
-;
+       asText(geometry(wkt)) != wkt  OR
+       asText(geometry(wkb_xdr)) != wkt OR 
+       asText(geometry(wkb_ndr)) != wkt OR
+       asBinary(geometry(wkb_ndr)) != asBinary(geometry(wkb_xdr)) OR
+       asBinary(geometry(wkt)) != asBinary(geometry(wkb_xdr));
+

diff --git a/lwgeom/regress/lwgeom_regress_expected b/lwgeom/regress/lwgeom_regress_expected
index ba68e2902b1265e4a7cb8575f2e15a3d35faebb3..c6392fdabb3190209339801e56e0d9725e3162c8 100644 (file)
--- a/lwgeom/regress/lwgeom_regress_expected
+++ b/lwgeom/regress/lwgeom_regress_expected
@@ -1,17 +1 @@
-CREATE TABLE test_data (
-    id integer,
-    wkt text,
-    wkb_xdr wkb,
-    wkb_ndr wkb
-);
 CREATE TABLE
-SELECT id,wkt FROM test_data WHERE
-       asText(lwgeom(wkt)) != wkt  OR
-       asText(lwgeom(wkb_xdr)) != wkt OR 
-       asText(lwgeom(wkb_ndr)) != wkt OR
-       ( (asBinary(lwgeom(wkb_ndr)) != wkb_ndr) AND (asBinary(lwgeom(wkb_ndr)) != wkb_xdr)  )  OR
-       ( (asBinary(lwgeom(wkb_xdr)) != wkb_ndr) AND (asBinary(lwgeom(wkb_xdr)) != wkb_xdr)  ) 
- id | wkt 
-----+-----
-(0 rows)
-

diff --git a/lwgeom/regress/run_regress b/lwgeom/regress/run_regress
index a7c415e1272e7bbd7e24dad8fc1ee774379188ef..f1d59084b5b9b4450d77e236e76da98ce16d5b35 100755 (executable)
--- a/lwgeom/regress/run_regress
+++ b/lwgeom/regress/run_regress
@@ -1,18 +1,21 @@
-#!/bin/csh
+#!/bin/sh
 echo "Running LWGEOM Regression Test..."
 echo ""
-echo "Differences such as 'INSERT 18641077 1' are not important"
-echo ""
-echo "Building a database for testing (lwgeom_reg) on port 5432."
-echo "Building postgis and lwgeom support in it."
+echo "Building a database for testing (postgis_reg)."
+
+DB=postgis_reg
+createdb $DB > /dev/null
+
+echo "Building postgis support in it."
 echo ""
+
+createlang plpgsql $DB > /dev/null
+psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
+
 echo "there shouldnt be any real output produced after this line."
 echo ""
-createdb lwgeom_reg
-createlang plpgsql lwgeom_reg
-psql -e lwgeom_reg <../../postgis.sql >& /dev/null 
-psql -e lwgeom_reg <../lwgeom.sql >& /dev/null 
-psql -e lwgeom_reg <lwgeom_regress.sql |& grep -v "^INSERT" > lwgeom_regress_out
+
+psql -tA < lwgeom_regress.sql $DB 2>&1 | grep -v "^INSERT" > lwgeom_regress_out
 diff lwgeom_regress_out lwgeom_regress_expected
-sleep 5
-dropdb lwgeom_reg
+sleep 1
+dropdb $DB > /dev/null