From: Paul Ramsey Date: Thu, 4 Jun 2009 14:17:07 +0000 (+0000) Subject: Fix for #192. X-Git-Tag: 1.4.0b1~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f31941735b482dc80d15f18ada1600d172b44c08;p=postgis Fix for #192. git-svn-id: http://svn.osgeo.org/postgis/trunk@4134 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/regress/Makefile.in b/regress/Makefile.in index 84e3e579f..60080404f 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -5,6 +5,13 @@ POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@ POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@ PGSQL_BINDIR=@PGSQL_BINDIR@ +# +# Put path from pg_config into front of search path +# +PATH := $(PGSQL_BINDIR):$(PATH) +export PATH + + TESTS = \ loader/Point \ loader/PointM \ @@ -63,7 +70,7 @@ all: test test check: ../postgis/postgis.so ../loader/pgsql2shp ../loader/shp2pgsql cp ../postgis/postgis.sql . - $(shell USE_VERSION=$(POSTGIS_PGSQL_VERSION) USE_PATH=$(PGSQL_BINDIR) ./run_test $(TESTS)) + @USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(TESTS) ../postgis/postgis.so: diff --git a/regress/run_test b/regress/run_test index f8decce9f..b0f770ef0 100755 --- a/regress/run_test +++ b/regress/run_test @@ -25,9 +25,7 @@ if [ -n "$USE_VERSION" ]; then fi fi -if [ -n "$USE_PATH" ]; then - export PATH=${USE_PATH}:${PATH} -fi + PSQL="psql" @@ -438,6 +436,7 @@ libbuilddate=`${PSQL} -tAc "select postgis_lib_build_date()" "${DB}"` pgsqlver=`${PSQL} -tAc "select version()" "${DB}"` echo "TMPDIR is ${TMPDIR}" +echo "PATH is ${PATH}" echo echo " $pgsqlver"