summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2025-11-24 19:33:51 +0900
committerMichael Paquier <michael@paquier.xyz>2025-11-24 19:33:51 +0900
commite429c3cecb4ac55d997acea0f76c5f06d6cb0ab3 (patch)
tree081a8d1036c7c3ea5f76767ba7aa8a6b33ab5dc7 /src
parentd4c0f91f7d57066b9d62c0eccb2a913d40c14066 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/test/isolation/isolation_schedule1
-rw-r--r--src/test/modules/Makefile1
-rw-r--r--src/test/modules/index/.gitignore6
-rw-r--r--src/test/modules/index/Makefile16
-rw-r--r--src/test/modules/index/expected/killtuples.out (renamed from src/test/isolation/expected/index-killtuples.out)0
-rw-r--r--src/test/modules/index/meson.build12
-rw-r--r--src/test/modules/index/specs/killtuples.spec (renamed from src/test/isolation/specs/index-killtuples.spec)0
-rw-r--r--src/test/modules/meson.build1
8 files changed, 36 insertions, 1 deletions
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index 5afae33d370..112f05a3677 100644
--- 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: index-killtuples
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 902a7954101..d079b91b1a2 100644
--- a/src/test/modules/Makefile
+++ b/src/test/modules/Makefile
@@ -10,6 +10,7 @@ SUBDIRS = \
delay_execution \
dummy_index_am \
dummy_seclabel \
+ index \
libpq_pipeline \
oauth_validator \
plsample \
diff --git a/src/test/modules/index/.gitignore b/src/test/modules/index/.gitignore
new file mode 100644
index 00000000000..b4903eba657
--- /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
index 00000000000..29047044ede
--- /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
index be7ddd756ef..be7ddd756ef 100644
--- a/src/test/isolation/expected/index-killtuples.out
+++ b/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
index 00000000000..1b3c42d8a2f
--- /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
index 77fe8c689a7..77fe8c689a7 100644
--- a/src/test/isolation/specs/index-killtuples.spec
+++ b/src/test/modules/index/specs/killtuples.spec
diff --git a/src/test/modules/meson.build b/src/test/modules/meson.build
index 14fc761c4cf..f5114469b92 100644
--- 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('index')
subdir('injection_points')
subdir('ldap_password_func')
subdir('libpq_pipeline')