git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0251106)

Add NO_INSTALL option to pgxs

author Peter Eisentraut <peter@eisentraut.org>

2021年5月27日 11:58:13 +0000 (13:58 +0200)

committer Peter Eisentraut <peter@eisentraut.org>

2021年5月27日 11:58:29 +0000 (13:58 +0200)

Apply in libpq_pipeline test makefile, so that the test file is not
installed into tmp_install.

Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/cb9d16a6-760f-cd44-28d6-b091d5fb6ca7%40enterprisedb.com

doc/src/sgml/extend.sgml patch | blob | blame | history

src/makefiles/pgxs.mk patch | blob | blame | history

src/test/modules/libpq_pipeline/Makefile patch | blob | blame | history

diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml

index ec95b4eb013653ef41555c677708a62d6316ba96..dae57375748faadc820c3aabd060c457daede49f 100644 (file)

--- a/doc/src/sgml/extend.sgml

+++ b/doc/src/sgml/extend.sgml

@@ -1672,6 +1672,16 @@ include $(PGXS)

</listitem>

</varlistentry>

+ <varlistentry>

+ <term><varname>NO_INSTALL</varname></term>

+ <listitem>

+ <para>

+ don't define an <literal>install</literal> target, useful for test

+ modules that don't need their build products to be installed

+ </para>

+ </listitem>

+ </varlistentry>

+

<varlistentry>

<term><varname>NO_INSTALLCHECK</varname></term>

<listitem>

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk

index 271e7eaba8289bd4a52c415ca27e073f1879dfc0..0f71fa293d09902d1427a7092660c22203ffb0b4 100644 (file)

--- a/src/makefiles/pgxs.mk

+++ b/src/makefiles/pgxs.mk

@@ -49,6 +49,8 @@

# TAP_TESTS -- switch to enable TAP tests

# ISOLATION -- list of isolation test cases

# ISOLATION_OPTS -- additional switches to pass to pg_isolation_regress

+# NO_INSTALL -- don't define an install target, useful for test modules

+# that don't need their build products to be installed

# 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'

@@ -227,6 +229,8 @@ all: all-lib

endif # MODULE_big

+ifndef NO_INSTALL

+

install: all installdirs

ifneq (,$(EXTENSION))

$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'

@@ -336,6 +340,15 @@ endif # with_llvm

uninstall: uninstall-lib

endif # MODULE_big

+else # NO_INSTALL

+

+# Need this so that temp-install builds artifacts not meant for

+# installation (Normally, check should depend on all, but we don't do

+# that because of parallel make risk (dbf2ec1a1c0).)

+install: all

+

+endif # NO_INSTALL

+

clean:

ifdef MODULES

diff --git a/src/test/modules/libpq_pipeline/Makefile b/src/test/modules/libpq_pipeline/Makefile

index b798f5fbbc913cd6544dbd3fd6487a6465ebae2a..c9c5ae1beb54f6aded0bb7ed11cfd08ac13ed3cf 100644 (file)

--- a/src/test/modules/libpq_pipeline/Makefile

+++ b/src/test/modules/libpq_pipeline/Makefile

@@ -3,6 +3,8 @@

PROGRAM = libpq_pipeline

OBJS = libpq_pipeline.o

+NO_INSTALL = 1

+

PG_CPPFLAGS = -I$(libpq_srcdir)

PG_LIBS_INTERNAL += $(libpq_pgport)

This is the main PostgreSQL git repository.