[pgsql-ogr-fdw] 02/02: Patch Makefile to skip the "import foreign schema" tests on 9.3 and 9.4.

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository pgsql-ogr-fdw.

commit 2759d63b43e84a78dd6235a33c9cc6b1fa19fc76
Author: Christoph Berg <myon at debian.org>
Date:   Tue Oct 3 21:37:25 2017 +0200

    Patch Makefile to skip the "import foreign schema" tests on 9.3 and 9.4.
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 +
 debian/patches/test-import-schema | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c50020d..f3c51e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pgsql-ogr-fdw (1.0.3-1) UNRELEASED; urgency=medium
   * Remove typos.patch.
   * Pull patch from upstream to fix building with gdal-2.2.
   * debian/tests: Run testsuite.
+  * Patch Makefile to skip the "import foreign schema" tests on 9.3 and 9.4.
   * Add myself to Uploaders.
   * Bump S-V; no changes.
 
diff --git a/debian/patches/series b/debian/patches/series
index 726c08d..a51d0b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 install.patch
+test-import-schema
 gdal-2.2
diff --git a/debian/patches/test-import-schema b/debian/patches/test-import-schema
new file mode 100644
index 0000000..7f19b99
--- /dev/null
+++ b/debian/patches/test-import-schema
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,12 +20,17 @@ PG_CPPFLAGS += $(GDAL_CFLAGS)
+ LIBS += $(GDAL_LIBS)
+ SHLIB_LINK := $(LIBS)
+ 
+-# order matters, file first, import last
+-REGRESS = file pgsql import
+-
+ PGXS := $(shell $(PG_CONFIG) --pgxs)
+ include $(PGXS)
+ 
++PG_VERSION_NUM = $(shell awk '/PG_VERSION_NUM/ { print $$3 }' $(shell $(PG_CONFIG) --includedir-server)/pg_config.h)
++HAS_IMPORT_SCHEMA = $(shell [ $(PG_VERSION_NUM) -ge 90500 ] && echo yes)
++
++# order matters, file first, import last
++REGRESS = file pgsql
++ifeq ($(HAS_IMPORT_SCHEMA),yes)
++REGRESS += import
++endif
+ 
+ ###############################################################
+ # Build the utility program after PGXS to override the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgsql-ogr-fdw.git