[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-133-g78f61fb

Tue Nov 3 05:49:58 PST 2020

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  78f61fb1be3bffd05ffe6e01e40ed68f7191097c (commit)
       via  b13e16d62780bf8acccbdaee973e55f010f2299d (commit)
      from  873d3e5a099dff60614be54c65657eebab184e80 (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 78f61fb1be3bffd05ffe6e01e40ed68f7191097c
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Nov 3 14:49:10 2020 +0100

    Do not let Travis run tests in parallel
    
    It's not supported, and makes reading logs an hell anyway

diff --git a/ci/travis/run_tests.sh b/ci/travis/run_tests.sh
index bad7a77..36a34ec 100644
--- a/ci/travis/run_tests.sh
+++ b/ci/travis/run_tests.sh
@@ -16,4 +16,5 @@ export CUNIT_VALGRIND_FLAGS="--leak-check=full --error-exitcode=1"
 
 # Standard build
 ./configure CFLAGS="${CFLAGS_STD}" LDFLAGS="${LDFLAGS_STD}"
-bash ./ci/travis/logbt -- make -j check RUNTESTFLAGS=--verbose
+bash ./ci/travis/logbt -- make -j
+bash ./ci/travis/logbt -- make check RUNTESTFLAGS=--verbose

commit b13e16d62780bf8acccbdaee973e55f010f2299d
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Nov 3 14:48:56 2020 +0100

    Allow running core regress tests without sfcgal

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2fe6a9b..ef65ec0 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -194,7 +194,7 @@ include regress/loader/tests.mk
 include regress/dumper/tests.mk
 ifeq ($(HAVE_SFCGAL),yes)
 	override RUNTESTFLAGS := $(RUNTESTFLAGS) --sfcgal
-	include regress/sfcgal/tests.mk
+	include sfcgal/regress/tests.mk
 endif
 ifeq (@TOPOLOGY@,topology)
 	override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
diff --git a/configure.ac b/configure.ac
index a82d8c3..bcbc7cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1579,6 +1579,7 @@ AC_OUTPUT([GNUmakefile
    postgis/Makefile
    postgis/sqldefines.h
 	 sfcgal/Makefile
+   sfcgal/regress/Makefile
    loader/Makefile
    loader/cunit/Makefile
    topology/Makefile
@@ -1588,7 +1589,6 @@ AC_OUTPUT([GNUmakefile
    regress/core/tests.mk
    regress/dumper/Makefile
    regress/loader/Makefile
-   regress/sfcgal/Makefile
    doc/Makefile
    doc/Makefile.comments
    doc/html/image_src/Makefile
diff --git a/regress/Makefile.in b/regress/Makefile.in
index e05bc23..c1449f3 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -48,10 +48,6 @@ check-unit:
 include core/tests.mk
 include loader/tests.mk
 include dumper/tests.mk
-ifeq ($(HAVE_SFCGAL),yes)
-	override RUNTESTFLAGS := $(RUNTESTFLAGS) --sfcgal
-	include sfcgal/tests.mk
-endif
 
 include runtest.mk
 
@@ -64,7 +60,6 @@ distclean: clean
 	rm -f core/Makefile
 	rm -f loader/Makefile
 	rm -f dumper/Makefile
-	rm -f sfcgal/Makefile
 
 staged-install-sfcgal:
 	@if test x"@SFCGAL@" != "x"; then \
diff --git a/sfcgal/Makefile.in b/sfcgal/Makefile.in
index 9455981..7c39b00 100644
--- a/sfcgal/Makefile.in
+++ b/sfcgal/Makefile.in
@@ -161,6 +161,7 @@ uninstall_sfcgal.sql: sfcgal.sql ../utils/create_undef.pl
 
 distclean: clean
 	rm -f Makefile
+	rm -f regress/Makefile
 
 check-unit:
 
diff --git a/regress/sfcgal/Makefile.in b/sfcgal/regress/Makefile.in
similarity index 94%
rename from regress/sfcgal/Makefile.in
rename to sfcgal/regress/Makefile.in
index 687f73a..e120ec2 100644
--- a/regress/sfcgal/Makefile.in
+++ b/sfcgal/regress/Makefile.in
@@ -17,6 +17,6 @@ override RUNTESTFLAGS := $(RUNTESTFLAGS) --sfcgal
 topsrcdir = $(realpath ../../)
 
 include tests.mk
-include ../runtest.mk
+include ../../regress/runtest.mk
 
 check: check-regress
diff --git a/regress/sfcgal/README b/sfcgal/regress/README
similarity index 100%
rename from regress/sfcgal/README
rename to sfcgal/regress/README
diff --git a/regress/sfcgal/approximatemedialaxis.sql b/sfcgal/regress/approximatemedialaxis.sql
similarity index 100%
rename from regress/sfcgal/approximatemedialaxis.sql
rename to sfcgal/regress/approximatemedialaxis.sql
diff --git a/regress/sfcgal/approximatemedialaxis_expected b/sfcgal/regress/approximatemedialaxis_expected
similarity index 100%
rename from regress/sfcgal/approximatemedialaxis_expected
rename to sfcgal/regress/approximatemedialaxis_expected
diff --git a/regress/sfcgal/regress_sfcgal.sql b/sfcgal/regress/regress_sfcgal.sql
similarity index 100%
rename from regress/sfcgal/regress_sfcgal.sql
rename to sfcgal/regress/regress_sfcgal.sql
diff --git a/regress/sfcgal/regress_sfcgal_expected b/sfcgal/regress/regress_sfcgal_expected
similarity index 100%
rename from regress/sfcgal/regress_sfcgal_expected
rename to sfcgal/regress/regress_sfcgal_expected
diff --git a/regress/sfcgal/tests.mk b/sfcgal/regress/tests.mk
similarity index 100%
rename from regress/sfcgal/tests.mk
rename to sfcgal/regress/tests.mk

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile.in                                                    | 2 +-
 ci/travis/run_tests.sh                                            | 3 ++-
 configure.ac                                                      | 2 +-
 regress/Makefile.in                                               | 5 -----
 sfcgal/Makefile.in                                                | 1 +
 {regress/sfcgal => sfcgal/regress}/Makefile.in                    | 2 +-
 {regress/sfcgal => sfcgal/regress}/README                         | 0
 {regress/sfcgal => sfcgal/regress}/approximatemedialaxis.sql      | 0
 {regress/sfcgal => sfcgal/regress}/approximatemedialaxis_expected | 0
 {regress/sfcgal => sfcgal/regress}/regress_sfcgal.sql             | 0
 {regress/sfcgal => sfcgal/regress}/regress_sfcgal_expected        | 0
 {regress/sfcgal => sfcgal/regress}/tests.mk                       | 0
 12 files changed, 6 insertions(+), 9 deletions(-)
 rename {regress/sfcgal => sfcgal/regress}/Makefile.in (94%)
 rename {regress/sfcgal => sfcgal/regress}/README (100%)
 rename {regress/sfcgal => sfcgal/regress}/approximatemedialaxis.sql (100%)
 rename {regress/sfcgal => sfcgal/regress}/approximatemedialaxis_expected (100%)
 rename {regress/sfcgal => sfcgal/regress}/regress_sfcgal.sql (100%)
 rename {regress/sfcgal => sfcgal/regress}/regress_sfcgal_expected (100%)
 rename {regress/sfcgal => sfcgal/regress}/tests.mk (100%)


hooks/post-receive
-- 
PostGIS
