Skip to content

Commit

Permalink
[PGPRO-9336] Fix of isolation tests and beautify makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
VadimMinigaliev committed Oct 31, 2024
1 parent 9e78b97 commit a56d94c
Show file tree
Hide file tree
Showing 7 changed files with 291 additions and 1,587 deletions.
28 changes: 3 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_ha

TAP_TESTS = 1

ISOLATION = predicate-rum predicate-rum-2

ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
Expand All @@ -56,7 +58,7 @@ ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION)))
wal-check: temp-install
$(prove_check)

check: wal-check
check: wal-check
endif

all: $(SQL_built)
Expand All @@ -68,27 +70,3 @@ rum--$(EXTVERSION).sql: $(DATA_first) $(DATA_updates)
# rule for updates, e.g. rum--1.0--1.1.sql
rum--%.sql: gen_rum_sql--%.pl
perl $< > $@

install: installincludes

installincludes:
$(INSTALL) -d '$(DESTDIR)$(includedir_server)/'
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(RELATIVE_INCLUDES)) '$(DESTDIR)$(includedir_server)/'

uninstall: uninstallincludes

uninstallincludes:
rm -f $(addprefix '$(DESTDIR)$(includedir_server)/', $(INCLUDES))

ISOLATIONCHECKS= predicate-rum predicate-rum-2

submake-isolation:
$(MAKE) -C $(top_builddir)/src/test/isolation all

submake-rum:
$(MAKE) -C $(top_builddir)/contrib/rum

isolationcheck: | submake-isolation submake-rum temp-install
$(pg_isolation_regress_check) \
--temp-config $(top_srcdir)/contrib/rum/logical.conf \
$(ISOLATIONCHECKS)
Loading

0 comments on commit a56d94c

Please sign in to comment.