From c665ee5e505ebea4170450ac6ca4351158b8f2a9 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Mon, 3 Nov 2025 11:44:33 +0300
Subject: [PATCH v1 1/2] Move index-killtuples test to test/modules/index

index-killtuples test depends on btree_gin and btree_gist. Since we
don't want to depend on contrib/ in the src/test/regress/ tests, this
patch moves index-killuples test to test/modules/index/ directory. Also,
since the path has 'index' in its name, renaming index-killtuples test as
killtuples test.

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%40paquier.xyz
---
 src/test/isolation/isolation_schedule            |  1 -
 src/test/modules/Makefile                        |  1 +
 src/test/modules/index/.gitignore                |  6 ++++++
 src/test/modules/index/Makefile                  | 16 ++++++++++++++++
 .../index/expected/killtuples.out}               |  0
 src/test/modules/index/meson.build               | 12 ++++++++++++
 .../index/specs/killtuples.spec}                 |  0
 src/test/modules/meson.build                     |  1 +
 8 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/test/modules/index/.gitignore
 create mode 100644 src/test/modules/index/Makefile
 rename src/test/{isolation/expected/index-killtuples.out => modules/index/expected/killtuples.out} (100%)
 create mode 100644 src/test/modules/index/meson.build
 rename src/test/{isolation/specs/index-killtuples.spec => modules/index/specs/killtuples.spec} (100%)

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
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
index 00000000000..15f3734567a
--- /dev/null
+++ b/src/test/modules/index/meson.build
@@ -0,0 +1,12 @@
+# Copyright (c) 2022-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 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')
-- 
2.51.0