Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1d7dd18

Browse files
michaelpqmichaelpq
committed
Revert all new recent changes to add PGXS options for TAP and isolation
A set of failures in buildfarm machines are proving that this is not quite ready yet because of another set of issues: - MSVC scripts assume that REGRESS_OPTS can only use top_builddir. Some test suites actually finish by using top_srcdir, like pg_stat_statements which cause the regression tests to never run. - Trying to enforce top_builddir does not work either when using VPATH as this is not recognized properly. - TAP tests of bloom are unstable on various platforms, causing various failures.
1 parent 3955cae commit 1d7dd18

File tree

11 files changed

+133
-128
lines changed

11 files changed

+133
-128
lines changed

‎contrib/bloom/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ PGFILEDESC = "bloom access method - signature file based index"
99

1010
REGRESS = bloom
1111

12-
# Disable TAP tests for this module for now, as these are unstable on several
13-
# platforms, including recent Windows and macOS.
14-
# TAP_TESTS = 1
15-
1612
ifdef USE_PGXS
1713
PG_CONFIG = pg_config
1814
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -23,3 +19,6 @@ top_builddir = ../..
2319
include $(top_builddir)/src/Makefile.global
2420
include $(top_srcdir)/contrib/contrib-global.mk
2521
endif
22+
23+
wal-check: temp-install
24+
$(prove_check)

‎contrib/oid2name/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ PGAPPICON = win32
66
PROGRAM = oid2name
77
OBJS = oid2name.o $(WIN32RES)
88

9-
TAP_TESTS = 1
10-
119
PG_CPPFLAGS = -I$(libpq_srcdir)
1210
PG_LIBS_INTERNAL = $(libpq_pgport)
1311

12+
EXTRA_CLEAN = tmp_check
13+
1414
ifdef USE_PGXS
1515
PG_CONFIG = pg_config
1616
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -21,3 +21,9 @@ top_builddir = ../..
2121
include $(top_builddir)/src/Makefile.global
2222
include $(top_srcdir)/contrib/contrib-global.mk
2323
endif
24+
25+
check:
26+
$(prove_check)
27+
28+
installcheck:
29+
$(prove_installcheck)

‎contrib/test_decoding/Makefile

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,9 @@
33
MODULES = test_decoding
44
PGFILEDESC = "test_decoding - example of a logical decoding output plugin"
55

6-
EXTRA_INSTALL=contrib/test_decoding
7-
8-
REGRESS = ddl xact rewrite toast permissions decoding_in_xact \
9-
decoding_into_rel binary prepared replorigin time messages \
10-
spill slot truncate
11-
ISOLATION = mxact delayed_startup ondisk_startup concurrent_ddl_dml \
12-
oldest_xmin snapshot_transfer
13-
14-
REGRESS_OPTS = --temp-config=$(top_builddir)/contrib/test_decoding/logical.conf
15-
ISOLATION_OPTS = --temp-config=$(top_builddir)/contrib/test_decoding/logical.conf
16-
17-
# Disabled because these tests require "wal_level=logical", which
18-
# typical installcheck users do not have (e.g. buildfarm clients).
19-
NO_INSTALLCHECK = 1
6+
# Note: because we don't tell the Makefile there are any regression tests,
7+
# we have to clean those result files explicitly
8+
EXTRA_CLEAN = $(pg_regress_clean_files)
209

2110
ifdef USE_PGXS
2211
PG_CONFIG = pg_config
@@ -29,8 +18,52 @@ include $(top_builddir)/src/Makefile.global
2918
include $(top_srcdir)/contrib/contrib-global.mk
3019
endif
3120

21+
# Disabled because these tests require "wal_level=logical", which
22+
# typical installcheck users do not have (e.g. buildfarm clients).
23+
installcheck:;
24+
3225
# But it can nonetheless be very helpful to run tests on preexisting
3326
# installation, allow to do so, but only if requested explicitly.
34-
installcheck-force:
35-
$(pg_regress_installcheck) $(REGRESS)
36-
$(pg_isolation_regress_installcheck) $(ISOLATION)
27+
installcheck-force: regresscheck-install-force isolationcheck-install-force
28+
29+
check: regresscheck isolationcheck
30+
31+
submake-regress:
32+
$(MAKE) -C $(top_builddir)/src/test/regress all
33+
34+
submake-isolation:
35+
$(MAKE) -C $(top_builddir)/src/test/isolation all
36+
37+
submake-test_decoding:
38+
$(MAKE) -C $(top_builddir)/contrib/test_decoding
39+
40+
REGRESSCHECKS=ddl xact rewrite toast permissions decoding_in_xact \
41+
decoding_into_rel binary prepared replorigin time messages \
42+
spill slot truncate
43+
44+
regresscheck: | submake-regress submake-test_decoding temp-install
45+
$(pg_regress_check) \
46+
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
47+
$(REGRESSCHECKS)
48+
49+
regresscheck-install-force: | submake-regress submake-test_decoding temp-install
50+
$(pg_regress_installcheck) \
51+
$(REGRESSCHECKS)
52+
53+
ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml \
54+
oldest_xmin snapshot_transfer
55+
56+
isolationcheck: | submake-isolation submake-test_decoding temp-install
57+
$(pg_isolation_regress_check) \
58+
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
59+
$(ISOLATIONCHECKS)
60+
61+
isolationcheck-install-force: all | submake-isolation submake-test_decoding temp-install
62+
$(pg_isolation_regress_installcheck) \
63+
$(ISOLATIONCHECKS)
64+
65+
.PHONY: submake-test_decoding submake-regress check \
66+
regresscheck regresscheck-install-force \
67+
isolationcheck isolationcheck-install-force
68+
69+
temp-install: EXTRA_INSTALL=contrib/test_decoding

‎contrib/vacuumlo/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ PGAPPICON = win32
66
PROGRAM = vacuumlo
77
OBJS = vacuumlo.o $(WIN32RES)
88

9-
TAP_TESTS = 1
10-
119
PG_CPPFLAGS = -I$(libpq_srcdir)
1210
PG_LIBS_INTERNAL = $(libpq_pgport)
1311

12+
EXTRA_CLEAN = tmp_check
13+
1414
ifdef USE_PGXS
1515
PG_CONFIG = pg_config
1616
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -21,3 +21,9 @@ top_builddir = ../..
2121
include $(top_builddir)/src/Makefile.global
2222
include $(top_srcdir)/contrib/contrib-global.mk
2323
endif
24+
25+
check:
26+
$(prove_check)
27+
28+
installcheck:
29+
$(prove_installcheck)

‎doc/src/sgml/extend.sgml

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,34 +1303,6 @@ include $(PGXS)
13031303
</listitem>
13041304
</varlistentry>
13051305

1306-
<varlistentry>
1307-
<term><varname>ISOLATION</varname></term>
1308-
<listitem>
1309-
<para>
1310-
list of isolation test cases, see below for more details
1311-
</para>
1312-
</listitem>
1313-
</varlistentry>
1314-
1315-
<varlistentry>
1316-
<term><varname>ISOLATION_OPTS</varname></term>
1317-
<listitem>
1318-
<para>
1319-
additional switches to pass to
1320-
<application>pg_isolation_regress</application>
1321-
</para>
1322-
</listitem>
1323-
</varlistentry>
1324-
1325-
<varlistentry>
1326-
<term><varname>TAP_TESTS</varname></term>
1327-
<listitem>
1328-
<para>
1329-
switch defining if TAP tests need to be run, see below
1330-
</para>
1331-
</listitem>
1332-
</varlistentry>
1333-
13341306
<varlistentry>
13351307
<term><varname>NO_INSTALLCHECK</varname></term>
13361308
<listitem>
@@ -1451,42 +1423,13 @@ make VPATH=/path/to/extension/source/tree install
14511423
have all expected files.
14521424
</para>
14531425

1454-
<para>
1455-
The scripts listed in the <varname>ISOLATION</varname> variable are used
1456-
for tests stressing behavior of concurrent session with your module, which
1457-
can be invoked by <literal>make installcheck</literal> after doing
1458-
<literal>make install</literal>. For this to work you must have a
1459-
running <productname>PostgreSQL</productname> server. The script files
1460-
listed in <varname>ISOLATION</varname> must appear in a subdirectory
1461-
named <literal>specs/</literal> in your extension's directory. These files
1462-
must have extension <literal>.spec</literal>, which must not be included
1463-
in the <varname>ISOLATION</varname> list in the makefile. For each test
1464-
there should also be a file containing the expected output in a
1465-
subdirectory named <literal>expected/</literal>, with the same stem and
1466-
extension <literal>.out</literal>. <literal>make installcheck</literal>
1467-
executes each test script, and compares the resulting output to the
1468-
matching expected file. Any differences will be written to the file
1469-
<literal>output_iso/regression.diffs</literal> in
1470-
<command>diff -c</command> format. Note that trying to run a test that is
1471-
missing its expected file will be reported as <quote>trouble</quote>, so
1472-
make sure you have all expected files.
1473-
</para>
1474-
1475-
<para>
1476-
<literal>TAP_TESTS</literal> enables the use of TAP tests. Data from each
1477-
run is present in a subdirectory named <literal>tmp_check/</literal>.
1478-
See also <xref linkend="regress-tap"/> for more details.
1479-
</para>
1480-
14811426
<tip>
14821427
<para>
14831428
The easiest way to create the expected files is to create empty files,
14841429
then do a test run (which will of course report differences). Inspect
14851430
the actual result files found in the <literal>results/</literal>
1486-
directory (for tests in <literal>REGRESS</literal>), or
1487-
<literal>output_iso/results/</literal> directory (for tests in
1488-
<literal>ISOLATION</literal>), then copy them to
1489-
<literal>expected/</literal> if they match what you expect from the test.
1431+
directory, then copy them to <literal>expected/</literal> if they match
1432+
what you expect from the test.
14901433
</para>
14911434

14921435
</tip>

‎src/makefiles/pgxs.mk

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
# HEADERS_built_$(MODULE) -- as above but built first (also NOT cleaned)
4747
# REGRESS -- list of regression test cases (without suffix)
4848
# REGRESS_OPTS -- additional switches to pass to pg_regress
49-
# TAP_TESTS -- switch to enable TAP tests
50-
# ISOLATION -- list of isolation test cases
51-
# ISOLATION_OPTS -- additional switches to pass to pg_isolation_regress
5249
# NO_INSTALLCHECK -- don't define an installcheck target, useful e.g. if
5350
# tests require special configuration, or don't use pg_regress
5451
# EXTRA_CLEAN -- extra files to remove in 'make clean'
@@ -352,12 +349,6 @@ ifeq ($(PORTNAME), win)
352349
rm -f regress.def
353350
endif
354351
endif # REGRESS
355-
ifdef TAP_TESTS
356-
rm -rf tmp_check/
357-
endif
358-
ifdef ISOLATION
359-
rm -rf output_iso/ tmp_check_iso/
360-
endif
361352

362353
ifdef MODULE_big
363354
clean: clean-lib
@@ -392,47 +383,28 @@ $(test_files_build): $(abs_builddir)/%: $(srcdir)/%
392383
$(MKDIR_P) $(dir $@)
393384
ln -s $< $@
394385
endif # VPATH
395-
endif # REGRESS
396386

397387
.PHONY: submake
398388
submake:
399389
ifndef PGXS
400390
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress$(X)
401-
$(MAKE) -C $(top_builddir)/src/test/isolation all
402391
endif
403392

404-
# Standard rules to run regression tests including multiple test suites.
405-
# Runs against an installed postmaster
393+
# against installed postmaster
406394
ifndef NO_INSTALLCHECK
407395
installcheck: submake $(REGRESS_PREP)
408-
ifdef REGRESS
409396
$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
410397
endif
411-
ifdef ISOLATION
412-
$(pg_isolation_regress_installcheck) $(ISOLATION_OPTS) $(ISOLATION)
413-
endif
414-
ifdef TAP_TESTS
415-
$(prove_installcheck)
416-
endif
417-
endif # NO_INSTALLCHECK
418398

419-
# Runs independently of any installation
420399
ifdef PGXS
421400
check:
422401
@echo '"$(MAKE) check" is not supported.'
423402
@echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.'
424403
else
425404
check: submake $(REGRESS_PREP)
426-
ifdef REGRESS
427405
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
428406
endif
429-
ifdef ISOLATION
430-
$(pg_isolation_regress_check) $(ISOLATION_OPTS) $(ISOLATION)
431-
endif
432-
ifdef TAP_TESTS
433-
$(prove_check)
434-
endif
435-
endif # PGXS
407+
endif # REGRESS
436408

437409
ifndef NO_TEMP_INSTALL
438410
temp-install: EXTRA_INSTALL+=$(subdir)

‎src/test/modules/brin/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Generated subdirectories
2-
/output_iso/
2+
/isolation_output/
33
/tmp_check/

‎src/test/modules/brin/Makefile

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# src/test/modules/brin/Makefile
22

3-
EXTRA_INSTALL = contrib/pageinspect
3+
# Note: because we don't tell the Makefile there are any regression tests,
4+
# we have to clean those result files explicitly
5+
EXTRA_CLEAN = $(pg_regress_clean_files) ./isolation_output
46

5-
ISOLATION = summarization-and-inprogress-insertion
6-
TAP_TESTS = 1
7+
EXTRA_INSTALL=contrib/pageinspect
8+
9+
ISOLATIONCHECKS=summarization-and-inprogress-insertion
710

811
ifdef USE_PGXS
912
PG_CONFIG = pg_config
@@ -15,3 +18,19 @@ top_builddir = ../../../..
1518
include $(top_builddir)/src/Makefile.global
1619
include $(top_srcdir)/contrib/contrib-global.mk
1720
endif
21+
22+
check: isolation-check prove-check
23+
24+
isolation-check: | submake-isolation temp-install
25+
$(MKDIR_P) isolation_output
26+
$(pg_isolation_regress_check) \
27+
--outputdir=./isolation_output \
28+
$(ISOLATIONCHECKS)
29+
30+
prove-check: | temp-install
31+
$(prove_check)
32+
33+
.PHONY: check isolation-check prove-check
34+
35+
submake-isolation:
36+
$(MAKE) -C $(top_builddir)/src/test/isolation all

‎src/test/modules/commit_ts/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
REGRESS = commit_timestamp
44
REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
5-
TAP_TESTS = 1
65

76
ifdef USE_PGXS
87
PG_CONFIG = pg_config
@@ -14,3 +13,8 @@ top_builddir = ../../../..
1413
include $(top_builddir)/src/Makefile.global
1514
include $(top_srcdir)/contrib/contrib-global.mk
1615
endif
16+
17+
check: prove-check
18+
19+
prove-check: | temp-install
20+
$(prove_check)

0 commit comments

Comments
 (0)