@@ -21,12 +21,12 @@ RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES))
2121
2222LDFLAGS_SL +=$(filter -lm,$(LIBS ) )
2323
24- REGRESS = security rum rum_validate rum_hash ruminv timestamporderby orderby_hash \
25- altorder altorder_hash limits\
24+ REGRESS = security rum rum_validate rum_hash ruminv timestamp\
25+ orderby orderby_hash altorder altorder_hash limits\
2626int2 int4 int8 float4 float8 money oid\
2727time timetz date interval\
2828macaddr inet cidr text varchar char bytea bit varbit\
29- numeric rum_weight expr
29+ numeric rum_weight expr array
3030
3131TAP_TESTS = 1
3232
@@ -66,25 +66,17 @@ endif
6666endif
6767endif
6868
69- ifeq ($(MAJORVERSION ) , 9.6)
70- # arrays are not supported on 9.6
71- else
72- REGRESS += array
73- endif
74-
75- # For 9.6-11 we have to make specific target with tap tests
69+ # --------------------------------------------------------
70+ # Make conditional targets to save backward compatibility
71+ # with PG11, PG10 and PG9.6.
72+ # --------------------------------------------------------
7673ifeq ($(MAJORVERSION ) ,$(filter 9.6% 10% 11% ,$(MAJORVERSION ) ) )
77- wal-check : temp-install
78- $(prove_check )
7974
80- check : wal-check
75+ # arrays are not supported on 9.6
76+ ifeq ($(MAJORVERSION ) , 9.6)
77+ REGRESS :=$(filter-out array,$(REGRESS ) )
8178endif
8279
83- #
84- # Make conditional targets to save backward compatibility with PG11, PG10 and PG9.6.
85- #
86- ifeq ($(MAJORVERSION ) ,$(filter 9.6% 10% 11% ,$(MAJORVERSION ) ) )
87-
8880install : installincludes
8981
9082installincludes :
@@ -108,4 +100,9 @@ isolationcheck: | submake-isolation submake-rum temp-install
108100$(pg_isolation_regress_check ) \
109101--temp-config$(top_srcdir ) /contrib/rum/logical.conf\
110102$(ISOLATIONCHECKS )
103+
104+ # For 9.6-11 we have to make specific target with tap tests
105+ check : temp-install
106+ $(prove_check )
107+
111108endif
