Skip to content

Commit 22dfd11

Browse files
alvherrealvherre
committed
Move test modules from contrib to src/test/modules
This is advance preparation for introducing even more test modules; the easy solution is to add them to contrib, but that's bloated enough that it seems a good time to think of something different. Moved modules are dummy_seclabel, test_shm_mq, test_parser and worker_spi. (test_decoding was also a candidate, but there was too much opposition to moving that one. We can always reconsider later.)
1 parent 5b12987 commit 22dfd11

38 files changed

+212
-280
lines changed

‎contrib/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ SUBDIRS = \
1616
dblink \
1717
dict_int \
1818
dict_xsyn \
19-
dummy_seclabel \
2019
earthdistance \
2120
file_fdw \
2221
fuzzystrmatch \
@@ -51,12 +50,9 @@ SUBDIRS = \
5150
tablefunc \
5251
tcn \
5352
test_decoding \
54-
test_parser \
55-
test_shm_mq \
5653
tsearch2 \
5754
unaccent \
58-
vacuumlo \
59-
worker_spi
55+
vacuumlo
6056

6157
ifeq ($(with_openssl),yes)
6258
SUBDIRS += sslinfo

‎doc/src/sgml/contrib.sgml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
113113
&dblink;
114114
&dict-int;
115115
&dict-xsyn;
116-
&dummy-seclabel;
117116
&earthdistance;
118117
&file-fdw;
119118
&fuzzystrmatch;
@@ -141,8 +140,6 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
141140
&tablefunc;
142141
&tcn;
143142
&test-decoding;
144-
&test-parser;
145-
&test-shm-mq;
146143
&tsearch2;
147144
&unaccent;
148145
&uuid-ossp;

‎doc/src/sgml/dummy-seclabel.sgml

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎doc/src/sgml/ref/security_label.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ SECURITY LABEL FOR selinux ON TABLE mytable IS 'system_u:object_r:sepgsql_table_
207207
<title>See Also</title>
208208
<simplelist type="inline">
209209
<member><xref linkend="sepgsql"></member>
210-
<member><xref linkend="dummy-seclabel"></member>
210+
<member><filename>src/test/modules/dummy_seclabel</filename></member>
211211
</simplelist>
212212
</refsect1>
213213
</refentry>

‎doc/src/sgml/release-9.1.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8062,7 +8062,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
80628062

80638063
<listitem>
80648064
<para>
8065-
Add <link linkend="dummy-seclabel"><filename>dummy_seclabel</></link>
8065+
Add <filename>dummy_seclabel</>
80668066
contrib module (KaiGai Kohei)
80678067
</para>
80688068

‎doc/src/sgml/release-9.4.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
</para>
504504

505505
<para>
506-
This feature is illustrated in <xref linkend="test-shm-mq">.
506+
This feature is illustrated in <filename>contrib/test_shm_mq</filename>.
507507
</para>
508508
</listitem>
509509

‎doc/src/sgml/test-parser.sgml

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎doc/src/sgml/test-shm-mq.sgml

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/test/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ subdir = src/test
1212
top_builddir = ../..
1313
include $(top_builddir)/src/Makefile.global
1414

15-
SUBDIRS = regress isolation
15+
SUBDIRS = regress isolation modules
1616

17-
$(recurse)
17+
# We want to recurse to all subdirs for all standard targets, except that
18+
# installcheck and install should not recurse into the subdirectory "modules".
19+
20+
recurse_alldirs_targets := $(filter-out installcheck install, $(standard_targets))
21+
installable_dirs := $(filter-out modules, $(SUBDIRS))
22+
23+
$(call recurse,$(recurse_alldirs_targets))
24+
$(call recurse,installcheck, $(installable_dirs))
25+
$(call recurse,install, $(installable_dirs))

‎src/test/modules/Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# src/test/modules/Makefile
2+
3+
subdir = src/test/modules
4+
top_builddir = ../../..
5+
include $(top_builddir)/src/Makefile.global
6+
7+
SUBDIRS = \
8+
worker_spi \
9+
dummy_seclabel \
10+
test_shm_mq \
11+
test_parser
12+
13+
$(recurse)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy