Added process id to output files. Removed 'clean' rule.

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

diff --git a/regress/Makefile b/regress/Makefile
index 77270e25327a65389000b5b0adb0f1bf857690fd..1281ab46d3e97446032873b4aeff0ff094c65157 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -15,7 +15,3 @@ test-ogc:
        @./run_ogc_regress
 
 clean:
-       rm -f $(TMPDIR)/regress_out
-       rm -f $(TMPDIR)/lwgeom_regress_out
-       rm -f $(TMPDIR)/regress_index_out
-       rm -f $(TMPDIR)/regress_ogc_out

diff --git a/regress/run_index_regress b/regress/run_index_regress
index 0986ad571d2cc760824aca6ff59f512bf6d13555..1abaafa273dbf82856c53b4e27c80a5982d8f9d2 100755 (executable)
--- a/regress/run_index_regress
+++ b/regress/run_index_regress
@@ -1,19 +1,22 @@
 #!/bin/sh
 
-echo "Running Index Regression"
-echo ""
-echo "Index Creation will take some time..."
-echo ""
-
 if [ -z "$TMPDIR" ]; then
        TMPDIR=/tmp
 fi
 
+OUTFILE="${TMPDIR}/regress_index_out_$$"
+
+echo "Running Index Regression."
+echo "Output file is: '${OUTFILE}'"
+echo ""
+echo "Index Creation will take some time..."
+echo ""
+
 DB=postgis_reg
 createdb $DB > /dev/null
 createlang plpgsql $DB > /dev/null
 psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
-psql -tA < regress_index.sql $DB > "${TMPDIR}/regress_index_out" 2>&1
-diff regress_index_expected "${TMPDIR}/regress_index_out"
+psql -tA < regress_index.sql $DB > "${OUTFILE}" 2>&1
+diff regress_index_expected "${OUTFILE}"
 sleep 1
 dropdb $DB > /dev/null

diff --git a/regress/run_lwgeom_regress b/regress/run_lwgeom_regress
index ea0ca7a501abc059d10d5e7757c311ee07a77ec0..c507e3d7324d8e1a220dbf5d2e1ffb6c74803809 100755 (executable)
--- a/regress/run_lwgeom_regress
+++ b/regress/run_lwgeom_regress
@@ -1,12 +1,16 @@
 #!/bin/sh
-echo "Running LWGEOM Regression Test..."
-echo ""
-echo "Building a database for testing (postgis_reg)."
 
 if [ -z "$TMPDIR" ]; then
        TMPDIR=/tmp
 fi
 
+OUTFILE="${TMPDIR}/regress_lwgeom_out_$$"
+
+echo "Running LWGEOM Regression Test..."
+echo "Output file is: '${OUTFILE}'"
+echo ""
+echo "Building a database for testing (postgis_reg)."
+
 DB=postgis_reg
 createdb $DB > /dev/null
 
@@ -19,7 +23,7 @@ psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
 echo "there shouldnt be any real output produced after this line."
 echo ""
 
-psql -tA < lwgeom_regress.sql $DB 2>&1 | grep -v "^INSERT" > "${TMPDIR}/lwgeom_regress_out"
-diff lwgeom_regress_expected "${TMPDIR}/lwgeom_regress_out"
+psql -tA < lwgeom_regress.sql $DB 2>&1 | grep -v "^INSERT" > "${OUTFILE}"
+diff lwgeom_regress_expected "${OUTFILE}"
 sleep 1
 dropdb $DB > /dev/null

diff --git a/regress/run_ogc_regress b/regress/run_ogc_regress
index a6320a45426cadcf2b1fef4bb5aeb46df50664c2..2d5f19a0eab01356d8600be1ce0edf3282c84397 100755 (executable)
--- a/regress/run_ogc_regress
+++ b/regress/run_ogc_regress
@@ -1,18 +1,22 @@
 #!/bin/sh
-echo "Running OGC Regression Test..."
-echo 
-echo "       expected:'<'     obtained:'>'"
-echo
 
 if [ -z "$TMPDIR" ]; then
        TMPDIR=/tmp
 fi
 
+OUTFILE="${TMPDIR}/regress_ogc_out_$$"
+
+echo "Running OGC Regression Test..."
+echo "Output file is: '${OUTFILE}'"
+echo 
+echo "       expected:'<'     obtained:'>'"
+echo
+
 DB=postgis_reg
 createdb $DB > /dev/null
 createlang plpgsql $DB > /dev/null
 psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
-psql -tA < regress_ogc.sql $DB 2>&1 | grep -v INSERT > "${TMPDIR}/regress_ogc_out"
-diff regress_ogc_expected "${TMPDIR}/regress_ogc_out"
+psql -tA < regress_ogc.sql $DB 2>&1 | grep -v INSERT > "${OUTFILE}"
+diff regress_ogc_expected "${OUTFILE}"
 sleep 1
 dropdb $DB > /dev/null

diff --git a/regress/run_regress b/regress/run_regress
index 79220a23b62764b2b5cf36a70220bce162c1e188..f7425bfadf23d90a0aa58f35a1720007e3af36cc 100755 (executable)
--- a/regress/run_regress
+++ b/regress/run_regress
@@ -1,18 +1,22 @@
 #!/bin/sh
-echo "Running Normal Regression Test..."
-echo 
-echo "       expected:'<'     obtained:'>'"
-echo
 
 if [ -z "$TMPDIR" ]; then
        TMPDIR=/tmp
 fi
 
+OUTFILE="${TMPDIR}/regress_out_$$"
+
+echo "Running Normal Regression Test."
+echo "Output file is: '${OUTFILE}'"
+echo 
+echo "       expected:'<'     obtained:'>'"
+echo
+
 DB=postgis_reg
 createdb $DB > /dev/null
 createlang plpgsql $DB > /dev/null
 psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
-psql -tA < regress.sql $DB 2>&1 | grep -v INSERT > "${TMPDIR}/regress_out"
-diff regress_expected "${TMPDIR}/regress_out"
+psql -tA < regress.sql $DB 2>&1 | grep -v INSERT > "${OUTFILE}"
+diff regress_expected "${OUTFILE}"
 sleep 1
 dropdb $DB > /dev/null