8000 [PGPRO-9336] Fix of isolation tests and beautify makefile · postgrespro/rum@a56d94c · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a56d94c

Browse files
[PGPRO-9336] Fix of isolation tests and beautify makefile
1 parent 9e78b97 commit a56d94c

File tree

7 files changed

+291
-1587
lines changed

7 files changed

+291
-1587
lines changed

Makefile

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_ha
3434

3535
TAP_TESTS = 1
3636

37+
ISOLATION = predicate-rum predicate-rum-2
38+
3739
ifdef USE_PGXS
3840
PG_CONFIG = pg_config
3941
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -56,7 +58,7 @@ ifeq ($(MAJORVERSION), $(filter 9.6% 10% 11%, $(MAJORVERSION)))
5658
wal-check: temp-install
5759
$(prove_check)
5860

59-
check: wal-check
61+
check: wal-check
6062
endif
6163

6264
all: $(SQL_built)
@@ -68,27 +70,3 @@ rum--$(EXTVERSION).sql: $(DATA_first) $(DATA_updates)
6870
# rule for updates, e.g. rum--1.0--1.1.sql
6971
rum--%.sql: gen_rum_sql--%.pl
7072
perl $< > $@
71-
72-
install: installincludes
73-
74-
installincludes:
75-
$(INSTALL) -d '$(DESTDIR)$(includedir_server)/'
76-
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(RELATIVE_INCLUDES)) '$(DESTDIR)$(includedir_server)/'
77-
78-
uninstall: uninstallincludes
79-
80-
uninstallincludes:
81-
rm -f $(addprefix '$(DESTDIR)$(includedir_server)/', $(INCLUDES))
82-
83-
ISOLATIONCHECKS= predicate-rum predicate-rum-2
84-
85-
submake-isolation:
86-
$(MAKE) -C $(top_builddir)/src/test/isolation all
87-
88-
submake-rum:
89-
$(MAKE) -C $(top_builddir)/contrib/rum
90-
91-
isolationcheck: | submake-isolation submake-rum temp-install
92-
$(pg_isolation_regress_check) \
93-
--temp-config $(top_srcdir)/contrib/rum/logical.conf \
94-
$(ISOLATIONCHECKS)

0 commit comments

Comments
 (0)
0