From: Sandro Santilli Date: Sun, 25 Jun 2006 23:45:30 +0000 (+0000) Subject: Fixed the lc_messages failure by avoiding attempts at setting it when run against... X-Git-Tag: pgis_1_1_3~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f57847e2e37b10a299d3ea5664bdea58512bf42;p=postgis Fixed the lc_messages failure by avoiding attempts at setting it when run against a postgresql version < 8.0. Also fixed a path in a message from run_test. git-svn-id: http://svn.osgeo.org/postgis/trunk@2397 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/regress/Makefile b/regress/Makefile index b19d9aa1d..c62777358 100644 --- 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 d502d5364..50902994e 100755 --- 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."