[Git][debian-gis-team/postgis][experimental] regress/run_test.pl: Cherry-pick fix for running on installed packages.

[Christoph Berg]

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


Commits:
670cbcaa by Christoph Berg at 2019-10-08T09:57:48Z
regress/run_test.pl: Cherry-pick fix for running on installed packages.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/run-test-extension
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+postgis (3.0.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * regress/run_test.pl: Cherry-pick fix for running on installed packages.
+
+ -- Christoph Berg <myon at debian.org>  Tue, 08 Oct 2019 11:53:04 +0200
+
 postgis (3.0.0~rc1+dfsg-1~exp1) experimental; urgency=medium
 
   [ Bas Couwenberg ]


=====================================
debian/patches/run-test-extension
=====================================
@@ -0,0 +1,38 @@
+commit 03d84f8a9ac7ad9ca81cffa8d5bdf1db134d4332
+Author: Sandro Santilli <strk at kbt.io>
+Date:   Tue Oct 8 09:43:14 2019 +0000
+
+    Force using systemwide scripts when run with --extension
+    
+    .. rather than relying on version mismatch (current vs. requested)
+    to tell where to pick scripts from ..
+    
+    *might* relate to #4515
+    
+    git-svn-id: http://svn.osgeo.org/postgis/trunk@17888 b70326c6-7e19-0410-871a-916f4a2858ee
+
+diff --git a/regress/run_test.pl b/regress/run_test.pl
+index 3ce3a2d16..1693eec00 100755
+--- a/regress/run_test.pl
++++ b/regress/run_test.pl
+@@ -254,9 +254,9 @@ if ( ! $libver )
+ 
+ sub scriptdir
+ {
+-	my $version = shift;
++	my ( $version, $systemwide ) = @_;
+ 	my $scriptdir;
+-	if ( $version and $version ne $libver ) {
++	if ( $systemwide or ( $version and $version ne $libver ) ) {
+ 		my $pgis_majmin = $version;
+ 		$pgis_majmin =~ s/^([1-9]*\.[0-9]*).*/\1/;
+ 		$scriptdir = `pg_config --sharedir`;
+@@ -756,7 +756,7 @@ sub run_simple_test
+ 	mkpath($betmpdir);
+ 	chmod 0777, $betmpdir;
+ 
+-	my $scriptdir = scriptdir($libver);
++	my $scriptdir = scriptdir($libver, $OPT_EXTENSIONS);
+ 	my $cmd = "psql -v \"VERBOSITY=terse\""
+           . " -v \"tmpfile='$tmpfile'\""
+           . " -v \"scriptdir=$scriptdir\""


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 relax-test-timing-constraints.patch
+run-test-extension



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/670cbcaae16dc4319fc27b76f90d4e23f78a87af
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/20191008/07ab0293/attachment-0001.html>