[Git][debian-gis-team/postgis][master] regress: Use correct pg_config binary

[Christoph Berg]

Christoph Berg pushed to branch master at Debian GIS Project / postgis


Commits:
f771f8af by Christoph Berg at 2019-10-14T10:40:55Z
regress: Use correct pg_config binary

- - - - -


3 changed files:

- + debian/patches/regress-pg-config
- debian/patches/series
- debian/tests/regress


Changes:

=====================================
debian/patches/regress-pg-config
=====================================
@@ -0,0 +1,12 @@
+--- a/regress/run_test.pl
++++ b/regress/run_test.pl
+@@ -709,7 +709,8 @@ sub run_simple_test
+ 		# TODO: allow override this default with env variable ?
+ 		my $pgis_majmin = $libver;
+ 		$pgis_majmin =~ s/^([1-9]*\.[1-9]*).*/\1/;
+-		$scriptdir = `pg_config --sharedir`;
++		my $PG_CONFIG = $ENV{PG_CONFIG} // 'pg_config';
++		$scriptdir = `$PG_CONFIG --sharedir`;
+ 		chop $scriptdir;
+ 		$scriptdir .= "/contrib/postgis-" . $pgis_majmin;
+ 	} else {


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 link-liblwgeom
 relax-test-timing-constraints.patch
+regress-pg-config


=====================================
debian/tests/regress
=====================================
@@ -29,6 +29,16 @@ trap "rm -rf /tmp/pgis_reg $PRGS regress/staged-install* || :" EXIT
 
 # run the regression tests
 for v in $(pg_buildext supported-versions); do
+  case $v in
+    9*) POSTGIS_PGSQL_VERSION=$(echo $v | tr -d .) ;;
+    *) POSTGIS_PGSQL_VERSION="${v}0" ;;
+  esac
   pg_virtualenv -v $v \
-    make -C regress -f Makefile.in check PERL=perl RUNTESTFLAGS="--extension --verbose" POSTGIS_GEOS_VERSION=$POSTGIS_GEOS_VERSION HAVE_SFCGAL=yes
+    make -C regress -f Makefile.in check \
+      PERL=perl \
+      RUNTESTFLAGS="--extension --verbose" \
+      POSTGIS_PGSQL_VERSION=$POSTGIS_PGSQL_VERSION \
+      POSTGIS_GEOS_VERSION=$POSTGIS_GEOS_VERSION \
+      PG_CONFIG=/usr/lib/postgresql/$v/bin/pg_config \
+      HAVE_SFCGAL=yes
 done



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/f771f8af345c717e84d9998ed577363eb0444e04

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/f771f8af345c717e84d9998ed577363eb0444e04
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191014/17a20fcd/attachment-0001.html>