Move isolation test index-killtuples to src/test/modules/index/

index-killtuples test depends on the contrib modules btree_gin and
btree_gist, which would not be installed in a temporary installation
with an execution of the main isolation test suite like this one:
make -C src/test/isolation/ check

src/test/isolation/ should not depend on contrib/, and EXTRA_INSTALL has
no effect in this case as this test suite uses its own Makefile rules.

This commit moves index-killtuples into its new module, called "index",
whose name looks like the best fit there can be as it depends on more
than one index AM.  btree_gin and btree_gist are now pulled in the
temporary installation with EXTRA_INSTALL.  The test is renamed to
"killtuples", for simplicity.

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Suggested-by: Andres Freund <andres@anarazel.de>
Suggested-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/aKJsWedftW7UX1WM@paquier.xyz

diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index 5afae33d37036aca1a0f4766570dab20cf3c07ab..112f05a3677d2283fdc52a63d88f735b33be3499 100644 (file)
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -16,7 +16,6 @@ test: ri-trigger
 test: partial-index
 test: two-ids
 test: multiple-row-versions
 test: partial-index
 test: two-ids
 test: multiple-row-versions

-test: index-killtuples

 test: index-only-scan
 test: index-only-bitmapscan
 test: predicate-lock-hot-tuple
 test: index-only-scan
 test: index-only-bitmapscan
 test: predicate-lock-hot-tuple

diff --git a/src/test/modules/Makefile b/src/test/modules/Makefile
index 902a7954101095c78bdb1b4e8af79012dc198d22..d079b91b1a28b949c9b0744ff8ad55609d614658 100644 (file)
--- a/src/test/modules/Makefile
+++ b/src/test/modules/Makefile
@@ -10,6 +10,7 @@ SUBDIRS = \
          delay_execution \
          dummy_index_am \
          dummy_seclabel \
          delay_execution \
          dummy_index_am \
          dummy_seclabel \

+         index \

          libpq_pipeline \
          oauth_validator \
          plsample \
          libpq_pipeline \
          oauth_validator \
          plsample \

diff --git a/src/test/modules/index/.gitignore b/src/test/modules/index/.gitignore
new file mode 100644 (file)
index 0000000..b4903eb
--- /dev/null
+++ b/src/test/modules/index/.gitignore
@@ -0,0 +1,6 @@
+# Generated subdirectories
+/log/
+/results/
+/output_iso/
+/tmp_check/
+/tmp_check_iso/

diff --git a/src/test/modules/index/Makefile b/src/test/modules/index/Makefile
new file mode 100644 (file)
index 0000000..2904704
--- /dev/null
+++ b/src/test/modules/index/Makefile
@@ -0,0 +1,16 @@
+# src/test/modules/index/Makefile
+
+EXTRA_INSTALL = contrib/btree_gin contrib/btree_gist
+
+ISOLATION = killtuples
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/test/modules/index
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif

diff --git a/src/test/isolation/expected/index-killtuples.out b/src/test/modules/index/expected/killtuples.out
similarity index 100%
rename from src/test/isolation/expected/index-killtuples.out
rename to src/test/modules/index/expected/killtuples.out

diff --git a/src/test/modules/index/meson.build b/src/test/modules/index/meson.build
new file mode 100644 (file)
index 0000000..1b3c42d
--- /dev/null
+++ b/src/test/modules/index/meson.build
@@ -0,0 +1,12 @@
+# Copyright (c) 2025, PostgreSQL Global Development Group
+
+tests += {
+  'name': 'index',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'isolation': {
+    'specs': [
+      'killtuples',
+    ],
+  },
+}

diff --git a/src/test/isolation/specs/index-killtuples.spec b/src/test/modules/index/specs/killtuples.spec
similarity index 100%
rename from src/test/isolation/specs/index-killtuples.spec
rename to src/test/modules/index/specs/killtuples.spec

diff --git a/src/test/modules/meson.build b/src/test/modules/meson.build
index 14fc761c4cfa931d15d8b96bcaf2c3fef5b2c6b4..f5114469b92e6ea2267b47b585ab04fd1a531742 100644 (file)
--- a/src/test/modules/meson.build
+++ b/src/test/modules/meson.build
@@ -6,6 +6,7 @@ subdir('delay_execution')
 subdir('dummy_index_am')
 subdir('dummy_seclabel')
 subdir('gin')
 subdir('dummy_index_am')
 subdir('dummy_seclabel')
 subdir('gin')

+subdir('index')

 subdir('injection_points')
 subdir('ldap_password_func')
 subdir('libpq_pipeline')
 subdir('injection_points')
 subdir('ldap_password_func')
 subdir('libpq_pipeline')