[SCM] PostGIS branch master updated. 3.4.0rc1-718-g120359068
git at osgeo.org
git at osgeo.org
Fri Oct 27 03:52:49 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 12035906869dd35d6906718b600402e15d36f843 (commit)
via b2ee709135c88ef3dea5b1b3abc729457d593d4b (commit)
from 5739cacd977d4917805a4485fa5f6b38dfce4d9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 12035906869dd35d6906718b600402e15d36f843
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Oct 27 12:49:39 2023 +0200
ci/dronie/postgis_regress.sh: do not override RUNTESTFLAGS
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 32becff59..f358c11ac 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -8,6 +8,11 @@ export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{pr
export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
psql --version
+
+# Make test runs verbose
+export RUNTESTFLAGS="$RUNTESTFLAGS -v"
+
+
#-----------------------------------------------
# Out of tree build for given PostgreSQL version
#-----------------------------------------------
@@ -28,9 +33,9 @@ psql -c "select version()" template1
# Pre-install tests
#-----------------------------------------------
-RUNTESTFLAGS=-v make check
-RUNTESTFLAGS=-v make check-double-upgrade
-RUNTESTFLAGS=-v make check-locked-upgrade
+make check
+make check-double-upgrade
+make check-locked-upgrade
#-----------------------------------------------
# Install
@@ -42,7 +47,7 @@ make install
# Post-install tests
#-----------------------------------------------
-RUNTESTFLAGS=-v make installcheck
+make installcheck
#-----------------------------------------------
# Upgrade tests
commit b2ee709135c88ef3dea5b1b3abc729457d593d4b
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Oct 27 11:38:58 2023 +0200
run_test.pl: add --after-create-db-script support
This can be used to configure target database, for example to
enable/configure pgextwlist
References #5566
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 1b7f47a44..5fa78b212 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -83,6 +83,7 @@ my $OPT_EXPECT = 0;
my $OPT_EXTENSIONS = 0;
my $OPT_LEGACY = 0;
my @OPT_HOOK_AFTER_CREATE;
+my @OPT_HOOK_AFTER_CREATE_DB;
my @OPT_HOOK_AFTER_RESTORE;
my @OPT_HOOK_BEFORE_DUMP;
my @OPT_HOOK_BEFORE_TEST;
@@ -115,6 +116,7 @@ GetOptions (
'schema=s' => \$OPT_SCHEMA,
'build-dir=s' => \$TOP_BUILDDIR,
'after-create-script=s' => \@OPT_HOOK_AFTER_CREATE,
+ 'after-create-db-script=s' => \@OPT_HOOK_AFTER_CREATE_DB,
'after-test-script=s' => \@OPT_HOOK_AFTER_TEST,
'before-uninstall-script=s' => \@OPT_HOOK_BEFORE_UNINSTALL,
'before-test-script=s' => \@OPT_HOOK_BEFORE_TEST,
@@ -737,6 +739,9 @@ Options:
--after-create-script <path>
script to load after spatial db creation
(multiple switches supported, to be run in given order)
+ --after-create-db-script <path>
+ script to load after db creation
+ (multiple switches supported, to be run in given order)
--before-uninstall-script <path>
script to load before spatial extension uninstall
(multiple switches supported, to be run in given order)
@@ -1514,7 +1519,14 @@ sub create_db
$createcmd .= " --owner $DB_OWNER";
}
$createcmd .= " $DB > $REGRESS_LOG";
- return not system($createcmd);
+
+ return 0 if system($createcmd);
+
+ foreach my $hook (@OPT_HOOK_AFTER_CREATE_DB)
+ {
+ print "Running after-create-db-script $hook\n";
+ die unless load_sql_file($hook, 1);
+ }
}
sub create_spatial
-----------------------------------------------------------------------
Summary of changes:
ci/dronie/postgis_regress.sh | 13 +++++++++----
regress/run_test.pl | 14 +++++++++++++-
2 files changed, 22 insertions(+), 5 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list