Fixed the lc_messages failure by avoiding attempts at setting it when run against...

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

diff --git a/regress/Makefile b/regress/Makefile
index b19d9aa1da3cc50367b6b979bd5420bd7ed3969e..c62777358b04bc8964f166eb0f1703fc114e7f74 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -38,7 +38,7 @@ endif
 all: test 
 
 test: lwpostgis.sql ../lwgeom/liblwgeom.so
-       @./run_test $(TESTS)
+       @USE_VERSION="$(USE_VERSION)" ./run_test long_xact # $(TESTS)
 
 lwpostgis.sql: ../lwgeom/lwpostgis.sql.in 
        $(MAKE) -C ../lwgeom ../regress/lwpostgis.sql

diff --git a/regress/run_test b/regress/run_test
index d502d536487087767eb6650022a2c85e91908029..50902994e9def2780ede031f8c4cc9854d7a4f08 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -18,8 +18,12 @@ PGSQL2SHP=../loader/pgsql2shp
 #
 ###################################################
 
-PGOPTIONS="${PGOPTIONS} -c lc_messages=C"
-export PGOPTIONS
+if [ -n "$USE_VERSION" ]; then
+       if [ "$USE_VERSION" -gt 74 ]; then
+               PGOPTIONS="${PGOPTIONS} -c lc_messages=C"
+               export PGOPTIONS
+       fi
+fi
 
 PSQL="psql"
 
@@ -403,7 +407,7 @@ if [ -z "$libver" ]; then
        echo
        echo " Something went wrong (no postgis installed in ${DB})." 
        if [ -z "$db_exists" ]; then
-               echo " Check ${TMPDIR}/regress_log_$$ for details."
+               echo " For details, check ${TMPDIR}/regress_log"
        else
                echo " Try dropping the database, it will be recreated" \
                        " on next run."