From: Andres Freund <andres@anarazel.de>
Subject: [PATCH] Provide NO_INSTALLCHECK for pgxs.
Date: Mon, 14 Nov 2016 12:29:30 -0800
This allows us to avoid running the regression tests in contrib modules
like pg_stat_statement in a less ugly manner.
Discussion: <22432.1478968242@sss.pgh.pa.us>
---
contrib/pg_stat_statements/Makefile | 7 +++----
doc/src/sgml/extend.sgml | 9 +++++++++
src/makefiles/pgxs.mk | 4 ++++
3 files changed, 16 insertions(+), 4 deletions(-)
inline patch 1: contrib/pg_stat_statements/Makefile, doc/src/sgml/extend.sgml, src/makefiles/pgxs.mk (+16/-4 lines) download inline-1.patchdiff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statements/Makefileindex f1a45eb..298951a 100644--- a/contrib/pg_stat_statements/Makefile+++ b/contrib/pg_stat_statements/Makefile@@ -13,6 +13,9 @@ LDFLAGS_SL += $(filter -lm, $(LIBS))
REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf
REGRESS = pg_stat_statements
+# Disabled because these tests require "shared_preload_libraries=pg_stat_statements",+# which typical installcheck users do not have (e.g. buildfarm clients).+NO_INSTALLCHECK = 1
ifdef USE_PGXS
PG_CONFIG = pg_config
@@ -24,7 +27,3 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
--# Disabled because these tests require "shared_preload_libraries=pg_stat_statements",-# which typical installcheck users do not have (e.g. buildfarm clients).-installcheck: REGRESS=diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgmlindex e19c657..f9d91a3 100644--- a/doc/src/sgml/extend.sgml+++ b/doc/src/sgml/extend.sgml@@ -1194,6 +1194,15 @@ include $(PGXS)
</varlistentry>
<varlistentry>
+ <term><varname>NO_INSTALLCHECK</varname></term>+ <listitem>+ <para>+ don't define an installcheck target, useful e.g. if tests require special configuration, or don't use pg_regress+ </para>+ </listitem>+ </varlistentry>++ <varlistentry>
<term><varname>EXTRA_CLEAN</varname></term>
<listitem>
<para>
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mkindex 2b4d684..c27004e 100644--- a/src/makefiles/pgxs.mk+++ b/src/makefiles/pgxs.mk@@ -40,6 +40,8 @@
# which need to be built first
# REGRESS -- list of regression test cases (without suffix)
# REGRESS_OPTS -- additional switches to pass to pg_regress
+# NO_INSTALLCHECK -- don't define an installcheck target, useful e.g. if+# tests require special configuration, or don't use pg_regress
# EXTRA_CLEAN -- extra files to remove in 'make clean'
# PG_CPPFLAGS -- will be added to CPPFLAGS
# PG_LIBS -- will be added to PROGRAM link line
@@ -268,8 +270,10 @@ ifndef PGXS
endif
# against installed postmaster
+ifndef NO_INSTALLCHECK
installcheck: submake $(REGRESS_PREP)
$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
+endif
ifdef PGXS
check:
--
2.10.2
--ae2y3mjzi3vicwx7
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
--ae2y3mjzi3vicwx7--
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: andres@anarazel.de
Subject: Re: [PATCH] Provide NO_INSTALLCHECK for pgxs.
In-Reply-To: <no-message-id-6748@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox