[postgis-tickets] r17888 - Force using systemwide scripts when run with --extension

[Sandro Santilli]

Author: strk
Date: 2019-10-08 02:43:14 -0700 (Tue, 08 Oct 2019)
New Revision: 17888

Modified:
   trunk/regress/run_test.pl
Log:
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

Modified: trunk/regress/run_test.pl
===================================================================
--- trunk/regress/run_test.pl	2019-10-08 06:16:31 UTC (rev 17887)
+++ trunk/regress/run_test.pl	2019-10-08 09:43:14 UTC (rev 17888)
@@ -254,9 +254,9 @@
 
 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 @@
 	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\""