Wrap pg_regress in a TAP test to setup cluster automatically

This makes the pg_regress tests much easier to run given that they then
can run in a clean cluster and nobody has to start and stop a cluster
manually.

For some reason our Meson support did not run any TAP tests which means
the tests are no longer runnable from Meson. This should likely be fixed
as a separate pull request.

Author: jeltz

.github/scripts/test.sh

@@ -3,22 +3,13 @@
 set -e
 
 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
-PG_BIN_DIR=$(pg_config --bindir)
 
 cd "$SCRIPT_DIR/../../"
 
 PG_VERSION=$(pg_config --version | sed -n 's/PostgreSQL \([0-9]*\).*/\1/p')
 
-OPTS='-c shared_preload_libraries=pg_stat_monitor'
-
 if [ "$1" = sanitize ]; then
-    OPTS+=' -c max_stack_depth=8MB'
+    export PG_TEST_INITDB_EXTRA_OPTS='--set max_stack_depth=8MB'
 fi
 
-$PG_BIN_DIR/pg_ctl -D regression_install -l regression_install.log init
-
-$PG_BIN_DIR/pg_ctl -D regression_install -l regression_install.log start -o "$OPTS"
-
-make installcheck
-
-$PG_BIN_DIR/pg_ctl -D regression_install stop
+make installcheck PROVE_FLAGS=-f

.gitignore

@@ -68,8 +68,8 @@ dkms.conf
 typedefs*.list
 
 # test files
-/regression.diffs
-/regression.out
-/results/
+/regression/regression.diffs
+/regression/regression.out
+/regression/results/
 /t/results/
 /tmp_check/

Makefile

@@ -12,31 +12,6 @@ PGFILEDESC = "pg_stat_monitor - Query Performance Monitoring Tool for PostgreSQL
 LDFLAGS_SL += $(filter -lm, $(LIBS))
 
 TAP_TESTS = 1
-REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_monitor/pg_stat_monitor.conf --inputdir=regression
-REGRESS = basic \
-	version \
-	guc \
-	pgsm_query_id \
-	functions \
-	counters \
-	relations \
-	database \
-	error_insert \
-	application_name \
-	application_name_unique \
-	top_query \
-	different_parent_queries \
-	cmd_type \
-	error \
-	rows \
-	squashing \
-	tags \
-	user \
-	rollback \
-	level_tracking \
-	decode_error_level \
-	parallel \
-	histogram
 
 PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

meson.build

@@ -24,41 +24,3 @@ install_data(
   'pg_stat_monitor--2.3--next.sql',
   kwargs: contrib_data_args,
 )
-
-tests += {
-  'name': 'pg_stat_monitor',
-  'sd': meson.current_source_dir(),
-  'bd': meson.current_build_dir(),
-  'regress': {
-    'sql': [
-      'application_name',
-      'application_name_unique',
-      'basic',
-      'cmd_type',
-      'counters',
-      'database',
-      'different_parent_queries',
-      'error_insert',
-      'error',
-      'functions',
-      'guc',
-      'histogram',
-      'level_tracking',
-      'parallel',
-      'pgsqm_query_id',
-      'relations',
-      'rows',
-      'squashing',
-      'state',
-      'tags',
-      'top_query',
-      'user',
-      'version'
-    ],
-    'regress_args': ['--temp-config', files('pg_stat_monitor.conf')],
-    # Disabled because these tests require
-    # "shared_preload_libraries=pg_stat_monitor", which typical
-    # runningcheck users do not have (e.g. buildfarm clients).
-    'runningcheck': false,
-  },
-}

pg_stat_monitor.conf

@@ -7,7 +7,7 @@ CREATE TABLE t2 (b int);
 \c db2
 CREATE TABLE t3 (c int);
 CREATE TABLE t4 (d int);
-\c contrib_regression
+\c pgsm_regression
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
 -----------------------
@@ -26,15 +26,15 @@ SELECT * FROM t3,t4 WHERE t3.c = t4.d;
 ---+---
 (0 rows)
 
-\c contrib_regression
+\c pgsm_regression
 DROP DATABASE db2;
 SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
-      datname       |                 query                 
---------------------+---------------------------------------
- contrib_regression | DROP DATABASE db2
- db1                | SELECT * FROM t1,t2 WHERE t1.a = t2.b
- db2                | SELECT * FROM t3,t4 WHERE t3.c = t4.d
- contrib_regression | SELECT pg_stat_monitor_reset()
+     datname     |                 query                 
+-----------------+---------------------------------------
+ pgsm_regression | DROP DATABASE db2
+ db1             | SELECT * FROM t1,t2 WHERE t1.a = t2.b
+ db2             | SELECT * FROM t3,t4 WHERE t3.c = t4.d
+ pgsm_regression | SELECT pg_stat_monitor_reset()
 (4 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -46,6 +46,6 @@ SELECT pg_stat_monitor_reset();
 \c db1
 DROP TABLE t1;
 DROP TABLE t2;
-\c contrib_regression
+\c pgsm_regression
 DROP DATABASE db1;
 DROP EXTENSION pg_stat_monitor;

regression/expected/database.out

@@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
     LANGUAGE SQL
     IMMUTABLE
     RETURNS NULL ON NULL INPUT;
-\c contrib_regression
+\c pgsmregression
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
 -----------------------
@@ -79,22 +79,22 @@ SELECT * FROM t3 where c = 20;
 ---
 (0 rows)
 
-\c contrib_regression
+\c pgsmregression
 SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
-      datname       |    pgsm_query_id    |                        query                        | calls 
---------------------+---------------------+-----------------------------------------------------+-------
- contrib_regression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
- db1                | 1897482803466821995 | SELECT * FROM t2                                    |     3
- db1                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db2                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db1                | 2864453209316739369 | select $1 + $2                                      |     1
- db2                | 2864453209316739369 | select $1 + $2                                      |     1
- db2                | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on  |     1
- db2                | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
- db1                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                |                     | SELECT * FROM t3                                    |     1
- db2                |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     1
+    datname     |    pgsm_query_id    |                        query                        | calls 
+----------------+---------------------+-----------------------------------------------------+-------
+ pgsmregression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
+ db1            | 1897482803466821995 | SELECT * FROM t2                                    |     3
+ db1            | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db2            | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db1            | 2864453209316739369 | select $1 + $2                                      |     1
+ db2            | 2864453209316739369 | select $1 + $2                                      |     1
+ db2            | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on  |     1
+ db2            | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
+ db1            | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2            | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2            |                     | SELECT * FROM t3                                    |     1
+ db2            |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     1
 (12 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -111,7 +111,7 @@ DROP FUNCTION ADD;
 DROP TABLE t1;
 DROP TABLE t3;
 DROP FUNCTION ADD;
-\c contrib_regression
+\c pgsmregression
 DROP DATABASE db1;
 DROP DATABASE db2;
 DROP EXTENSION pg_stat_monitor;

regression/expected/pgsm_query_id.out

@@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
     LANGUAGE SQL
     IMMUTABLE
     RETURNS NULL ON NULL INPUT;
-\c contrib_regression
+\c pgsm_regression
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
 -----------------------
@@ -79,20 +79,20 @@ SELECT * FROM t3 where c = 20;
 ---
 (0 rows)
 
-\c contrib_regression
+\c pgsm_regression
 SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
-      datname       |    pgsm_query_id    |                        query                        | calls 
---------------------+---------------------+-----------------------------------------------------+-------
- contrib_regression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
- db1                | 1897482803466821995 | SELECT * FROM t2                                    |     3
- db1                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db2                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db2                | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on  |     1
- db2                | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
- db1                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                |                     | SELECT * FROM t3                                    |     1
- db2                |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     1
+     datname     |    pgsm_query_id    |                        query                        | calls 
+-----------------+---------------------+-----------------------------------------------------+-------
+ pgsm_regression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
+ db1             | 1897482803466821995 | SELECT * FROM t2                                    |     3
+ db1             | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db2             | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db2             | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on  |     1
+ db2             | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
+ db1             | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2             | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2             |                     | SELECT * FROM t3                                    |     1
+ db2             |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     1
 (10 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -109,7 +109,7 @@ DROP FUNCTION ADD;
 DROP TABLE t1;
 DROP TABLE t3;
 DROP FUNCTION ADD;
-\c contrib_regression
+\c pgsm_regression
 DROP DATABASE db1;
 DROP DATABASE db2;
 DROP EXTENSION pg_stat_monitor;

regression/expected/pgsm_query_id_1.out

@@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
     LANGUAGE SQL
     IMMUTABLE
     RETURNS NULL ON NULL INPUT;
-\c contrib_regression
+\c pgsm_regression
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
 -----------------------
@@ -79,19 +79,19 @@ SELECT * FROM t3 where c = 20;
 ---
 (0 rows)
 
-\c contrib_regression
+\c pgsm_regression
 SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
-      datname       |    pgsm_query_id    |                        query                        | calls 
---------------------+---------------------+-----------------------------------------------------+-------
- contrib_regression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
- db1                | 1897482803466821995 | SELECT * FROM t2                                    |     3
- db1                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db2                | 1988437669671417938 | SELECT * FROM t1                                    |     1
- db2                | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
- db1                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
- db2                |                     | SELECT * FROM t3                                    |     1
- db2                |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     2
+     datname     |    pgsm_query_id    |                        query                        | calls 
+-----------------+---------------------+-----------------------------------------------------+-------
+ pgsm_regression |  689150021118383254 | SELECT pg_stat_monitor_reset()                      |     1
+ db1             | 1897482803466821995 | SELECT * FROM t2                                    |     3
+ db1             | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db2             | 1988437669671417938 | SELECT * FROM t1                                    |     1
+ db2             | 6633979598391393345 | SELECT * FROM t3 where c = 20                       |     1
+ db1             | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2             | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1                         |     1
+ db2             |                     | SELECT * FROM t3                                    |     1
+ db2             |                     | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off |     2
 (9 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -108,7 +108,7 @@ DROP FUNCTION ADD;
 DROP TABLE t1;
 DROP TABLE t3;
 DROP FUNCTION ADD;
-\c contrib_regression
+\c pgsm_regression
 DROP DATABASE db1;
 DROP DATABASE db2;
 DROP EXTENSION pg_stat_monitor;

regression/expected/pgsm_query_id_2.out

@@ -12,12 +12,12 @@ BEGIN;
 INSERT INTO t VALUES (1);
 COMMIT;
 SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
-             query              | username |      datname       
---------------------------------+----------+--------------------
- BEGIN                          | u        | contrib_regression
- COMMIT                         | u        | contrib_regression
- INSERT INTO t VALUES (1)       | u        | contrib_regression
- SELECT pg_stat_monitor_reset() | u        | contrib_regression
+             query              | username |     datname     
+--------------------------------+----------+-----------------
+ BEGIN                          | u        | pgsm_regression
+ COMMIT                         | u        | pgsm_regression
+ INSERT INTO t VALUES (1)       | u        | pgsm_regression
+ SELECT pg_stat_monitor_reset() | u        | pgsm_regression
 (4 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -31,12 +31,12 @@ BEGIN;
 INSERT INTO t VALUES (2);
 ROLLBACK;
 SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
-             query              | username |      datname       
---------------------------------+----------+--------------------
- BEGIN                          | u        | contrib_regression
- INSERT INTO t VALUES (2)       | u        | contrib_regression
- ROLLBACK                       | u        | contrib_regression
- SELECT pg_stat_monitor_reset() | u        | contrib_regression
+             query              | username |     datname     
+--------------------------------+----------+-----------------
+ BEGIN                          | u        | pgsm_regression
+ INSERT INTO t VALUES (2)       | u        | pgsm_regression
+ ROLLBACK                       | u        | pgsm_regression
+ SELECT pg_stat_monitor_reset() | u        | pgsm_regression
 (4 rows)
 
 SELECT pg_stat_monitor_reset();
@@ -52,12 +52,12 @@ ERROR:  duplicate key value violates unique constraint "t_pkey"
 DETAIL:  Key (a)=(1) already exists.
 ROLLBACK;
 SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
-             query              | username |      datname       
---------------------------------+----------+--------------------
- BEGIN                          | u        | contrib_regression
- INSERT INTO t VALUES (1);      | u        | contrib_regression
+             query              | username |     datname     
+--------------------------------+----------+-----------------
+ BEGIN                          | u        | pgsm_regression
+ INSERT INTO t VALUES (1);      | u        | pgsm_regression
  ROLLBACK                       |          | 
- SELECT pg_stat_monitor_reset() | u        | contrib_regression
+ SELECT pg_stat_monitor_reset() | u        | pgsm_regression
 (4 rows)
 
 SELECT pg_stat_monitor_reset();