mirror of
https://github.com/postgres/postgres.git
synced 2025-07-14 08:21:07 +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:
2
src/test/modules/brin/.gitignore
vendored
2
src/test/modules/brin/.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
# Generated subdirectories
|
||||
/output_iso/
|
||||
/isolation_output/
|
||||
/tmp_check/
|
||||
|
@ -1,9 +1,12 @@
|
||||
# src/test/modules/brin/Makefile
|
||||
|
||||
EXTRA_INSTALL = contrib/pageinspect
|
||||
# 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) ./isolation_output
|
||||
|
||||
ISOLATION = summarization-and-inprogress-insertion
|
||||
TAP_TESTS = 1
|
||||
EXTRA_INSTALL=contrib/pageinspect
|
||||
|
||||
ISOLATIONCHECKS=summarization-and-inprogress-insertion
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
@ -15,3 +18,19 @@ top_builddir = ../../../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
endif
|
||||
|
||||
check: isolation-check prove-check
|
||||
|
||||
isolation-check: | submake-isolation temp-install
|
||||
$(MKDIR_P) isolation_output
|
||||
$(pg_isolation_regress_check) \
|
||||
--outputdir=./isolation_output \
|
||||
$(ISOLATIONCHECKS)
|
||||
|
||||
prove-check: | temp-install
|
||||
$(prove_check)
|
||||
|
||||
.PHONY: check isolation-check prove-check
|
||||
|
||||
submake-isolation:
|
||||
$(MAKE) -C $(top_builddir)/src/test/isolation all
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
REGRESS = commit_timestamp
|
||||
REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
|
||||
TAP_TESTS = 1
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
@ -14,3 +13,8 @@ top_builddir = ../../../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
endif
|
||||
|
||||
check: prove-check
|
||||
|
||||
prove-check: | temp-install
|
||||
$(prove_check)
|
||||
|
@ -4,12 +4,7 @@
|
||||
# we have to clean those result files explicitly
|
||||
EXTRA_CLEAN = $(pg_regress_clean_files)
|
||||
|
||||
ISOLATION = sto_using_cursor sto_using_select sto_using_hash_index
|
||||
ISOLATION_OPTS = --temp-config $(top_srcdir)/src/test/modules/snapshot_too_old/sto.conf
|
||||
|
||||
# Disabled because these tests require "old_snapshot_threshold" >= 0, which
|
||||
# typical installcheck users do not have (e.g. buildfarm clients).
|
||||
NO_INSTALLCHECK = 1
|
||||
ISOLATIONCHECKS=sto_using_cursor sto_using_select sto_using_hash_index
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
@ -22,7 +17,31 @@ include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
endif
|
||||
|
||||
# Disabled because these tests require "old_snapshot_threshold" >= 0, 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_isolation_regress_installcheck) $(ISOLATION)
|
||||
installcheck-force: isolationcheck-install-force
|
||||
|
||||
check: isolationcheck
|
||||
|
||||
submake-isolation:
|
||||
$(MAKE) -C $(top_builddir)/src/test/isolation all
|
||||
|
||||
submake-test_snapshot_too_old:
|
||||
$(MAKE) -C $(top_builddir)/src/test/modules/snapshot_too_old
|
||||
|
||||
isolationcheck: | submake-isolation submake-test_snapshot_too_old temp-install
|
||||
$(pg_isolation_regress_check) \
|
||||
--temp-config $(top_srcdir)/src/test/modules/snapshot_too_old/sto.conf \
|
||||
$(ISOLATIONCHECKS)
|
||||
|
||||
isolationcheck-install-force: all | submake-isolation submake-test_snapshot_too_old temp-install
|
||||
$(pg_isolation_regress_installcheck) \
|
||||
$(ISOLATIONCHECKS)
|
||||
|
||||
.PHONY: check submake-test_snapshot_too_old isolationcheck isolationcheck-install-force
|
||||
|
||||
temp-install: EXTRA_INSTALL=src/test/modules/snapshot_too_old
|
||||
|
@ -7,7 +7,6 @@ EXTENSION = test_pg_dump
|
||||
DATA = test_pg_dump--1.0.sql
|
||||
|
||||
REGRESS = test_pg_dump
|
||||
TAP_TESTS = 1
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
@ -19,3 +18,8 @@ top_builddir = ../../../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
include $(top_srcdir)/contrib/contrib-global.mk
|
||||
endif
|
||||
|
||||
check: prove-check
|
||||
|
||||
prove-check: | temp-install
|
||||
$(prove_check)
|
||||
|
Reference in New Issue
Block a user