mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
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.
This commit is contained in:
@ -3,20 +3,9 @@
|
||||
MODULES = test_decoding
|
||||
PGFILEDESC = "test_decoding - example of a logical decoding output plugin"
|
||||
|
||||
EXTRA_INSTALL=contrib/test_decoding
|
||||
|
||||
REGRESS = ddl xact rewrite toast permissions decoding_in_xact \
|
||||
decoding_into_rel binary prepared replorigin time messages \
|
||||
spill slot truncate
|
||||
ISOLATION = mxact delayed_startup ondisk_startup concurrent_ddl_dml \
|
||||
oldest_xmin snapshot_transfer
|
||||
|
||||
REGRESS_OPTS = --temp-config=$(top_builddir)/contrib/test_decoding/logical.conf
|
||||
ISOLATION_OPTS = --temp-config=$(top_builddir)/contrib/test_decoding/logical.conf
|
||||
|
||||
# Disabled because these tests require "wal_level=logical", which
|
||||
# typical installcheck users do not have (e.g. buildfarm clients).
|
||||
NO_INSTALLCHECK = 1
|
||||
# Note: because we don't tell the Makefile there are any regression tests,
|
||||
# we have to clean those result files explicitly
|
||||
EXTRA_CLEAN = $(pg_regress_clean_files)
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
@ -29,8 +18,52 @@ include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
endif
|
||||
|
||||
# Disabled because these tests require "wal_level=logical", which
|
||||
# typical installcheck users do not have (e.g. buildfarm clients).
|
||||
installcheck:;
|
||||
|
||||
# But it can nonetheless be very helpful to run tests on preexisting
|
||||
# installation, allow to do so, but only if requested explicitly.
|
||||
installcheck-force:
|
||||
$(pg_regress_installcheck) $(REGRESS)
|
||||
$(pg_isolation_regress_installcheck) $(ISOLATION)
|
||||
installcheck-force: regresscheck-install-force isolationcheck-install-force
|
||||
|
||||
check: regresscheck isolationcheck
|
||||
|
||||
submake-regress:
|
||||
$(MAKE) -C $(top_builddir)/src/test/regress all
|
||||
|
||||
submake-isolation:
|
||||
$(MAKE) -C $(top_builddir)/src/test/isolation all
|
||||
|
||||
submake-test_decoding:
|
||||
$(MAKE) -C $(top_builddir)/contrib/test_decoding
|
||||
|
||||
REGRESSCHECKS=ddl xact rewrite toast permissions decoding_in_xact \
|
||||
decoding_into_rel binary prepared replorigin time messages \
|
||||
spill slot truncate
|
||||
|
||||
regresscheck: | submake-regress submake-test_decoding temp-install
|
||||
$(pg_regress_check) \
|
||||
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
|
||||
$(REGRESSCHECKS)
|
||||
|
||||
regresscheck-install-force: | submake-regress submake-test_decoding temp-install
|
||||
$(pg_regress_installcheck) \
|
||||
$(REGRESSCHECKS)
|
||||
|
||||
ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml \
|
||||
oldest_xmin snapshot_transfer
|
||||
|
||||
isolationcheck: | submake-isolation submake-test_decoding temp-install
|
||||
$(pg_isolation_regress_check) \
|
||||
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
|
||||
$(ISOLATIONCHECKS)
|
||||
|
||||
isolationcheck-install-force: all | submake-isolation submake-test_decoding temp-install
|
||||
$(pg_isolation_regress_installcheck) \
|
||||
$(ISOLATIONCHECKS)
|
||||
|
||||
.PHONY: submake-test_decoding submake-regress check \
|
||||
regresscheck regresscheck-install-force \
|
||||
isolationcheck isolationcheck-install-force
|
||||
|
||||
temp-install: EXTRA_INSTALL=contrib/test_decoding
|
||||
|
Reference in New Issue
Block a user