Alter regression test harness so that shp2pgsql/pgsql2shp can be tested without being...

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

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 98f3aa0c15c41cb2a8f73e106e06541c82597138..794a0de0fc27e8dc32b742d3ef882ac4174f5148 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -45,6 +45,15 @@ LIBLWGEOM=../liblwgeom/liblwgeom.a
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 
+# If REGRESS=1 passed as a parameter, change the default install paths
+# so that no prefix is included. This allows us to relocate to a temporary
+# directory for regression testing.
+ifeq ($(REGRESS),1)
+       bindir=/bin
+       pkglibdir=/lib
+       datadir=/share
+endif
+
 
 # The real parts of the Makefile
 all: $(SHP2PGSQL) $(PGSQL2SHP) @GTK_BUILD@

diff --git a/regress/run_test b/regress/run_test
index a9e2ed6eef7fbbb287a355638ef03d5f5f13ccaa..30c173cc8a9e65a6fc828cf9bfdde4ce48d76fae 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -1,8 +1,12 @@
 #!/bin/sh
 
 DB=postgis_reg
-SHP2PGSQL=../loader/shp2pgsql
-PGSQL2SHP=../loader/pgsql2shp
+
+# TODO: get this part generated by ./configure. For now
+# we must make sure this matches REGRESS_INSTALLDIR in
+# Makefile.in.
+SHP2PGSQL=00-regress-install/bin/shp2pgsql
+PGSQL2SHP=00-regress-install/bin/pgsql2shp
 
 ###################################################
 #