Skip to content

Commit 8bd4d46

Browse files
committed
Add schedule for regression tests instead of list of tests in the REGRESS
variable. The real reason is to successfully pass the statement_timeout test in very slow environments. We must inialize REGRESS. So, add an empty dummy test just to define the variable. regress_schedule contains the full list of real tests. So all changes for real tests will be made in a general way in regress_schedule. Authors: a.lepikhov, m.polyakova.
1 parent 1275c61 commit 8bd4d46

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

‎Makefile

+4-19
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,10 @@ OBJS = $(WIN32RES) \
1111

1212
TAP_TESTS = 1
1313

14-
REGRESS = aqo_disabled \
15-
aqo_controlled \
16-
aqo_intelligent \
17-
aqo_forced \
18-
aqo_learn \
19-
schema \
20-
aqo_fdw \
21-
aqo_CVE-2020-14350 \
22-
gucs \
23-
forced_stat_collection \
24-
unsupported \
25-
clean_aqo_data \
26-
plancache \
27-
statement_timeout \
28-
temp_tables \
29-
top_queries \
30-
relocatable\
31-
look_a_like \
32-
feature_subspace
14+
# Use an empty dummy test to define the variable REGRESS and therefore run all
15+
# regression tests. regress_schedule contains the full list of real tests.
16+
REGRESS = aqo_dummy_test
17+
REGRESS_OPTS = --schedule=$(srcdir)/regress_schedule
3318

3419
fdw_srcdir = $(top_srcdir)/contrib/postgres_fdw
3520
stat_srcdir = $(top_srcdir)/contrib/pg_stat_statements

‎expected/aqo_dummy_test.out

Whitespace-only changes.

‎regress_schedule

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
test: aqo_disabled
2+
test: aqo_controlled
3+
test: aqo_intelligent
4+
test: aqo_forced
5+
test: aqo_learn
6+
test: schema
7+
test: aqo_fdw
8+
test: aqo_CVE-2020-14350
9+
test: gucs
10+
test: forced_stat_collection
11+
test: unsupported
12+
test: clean_aqo_data
13+
test: plancache
14+
# Performance-dependent test. Can be ignored if executes in containers or on slow machines
15+
ignore: statement_timeout
16+
test: statement_timeout
17+
test: temp_tables
18+
test: top_queries
19+
test: relocatable
20+
test: look_a_like
21+
test: feature_subspace

‎sql/aqo_dummy_test.sql

Whitespace-only changes.

0 commit comments

Comments
 (0)