From 9a614454227ba4926402ca152b4297367203eca6 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 17 Jul 2026 16:39:29 +0200
Subject: [PATCH 1/3] Remove DLPATH manipulation from TimescaleDB build scripts

This looks like a workaround for a missing "make install-tests" script
in Postgres.
---
 test/pgtest/CMakeLists.txt | 4 +---
 test/test-defs.cmake       | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/pgtest/CMakeLists.txt b/test/pgtest/CMakeLists.txt
index 93ec3037b47..ce6b8acb440 100644
--- a/test/pgtest/CMakeLists.txt
+++ b/test/pgtest/CMakeLists.txt
@@ -56,11 +56,9 @@ endforeach(IGNORE_TEST)
 # Write the final test schedule
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/schedule ${PG_TEST_SCHEDULE})
 
-# Need --dlpath set to PostgreSQL's test directory so that the tests can load
-# libraries there
 set(PG_REGRESS_OPTS_PGTEST
     --schedule=${CMAKE_CURRENT_BINARY_DIR}/schedule
-    --load-extension=timescaledb --dlpath=${PG_REGRESS_DIR})
+    --load-extension=timescaledb)
 
 add_custom_target(
   pginstallcheck
diff --git a/test/test-defs.cmake b/test/test-defs.cmake
index c7d6cea7e3d..baef6885f10 100644
--- a/test/test-defs.cmake
+++ b/test/test-defs.cmake
@@ -72,8 +72,6 @@ file(
   NO_SOURCE_PERMISSIONS
   FILE_PERMISSIONS OWNER_READ OWNER_WRITE)
 
-set(PG_REGRESS_OPTS_BASE --dlpath=${PROJECT_BINARY_DIR}/src)
-
 set(PG_REGRESS_OPTS_EXTRA
     --create-role=${TEST_ROLE_SUPERUSER},${TEST_ROLE_DEFAULT_PERM_USER},${TEST_ROLE_DEFAULT_PERM_USER_2},${TEST_ROLE_1},${TEST_ROLE_2},${TEST_ROLE_3},${TEST_ROLE_4},${TEST_ROLE_READ_ONLY}
     --dbname=${TEST_DBNAME}

From c2844b1b573a616cf79a89b9f3d168f9241f162b Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 17 Jul 2026 16:42:03 +0200
Subject: [PATCH 2/3] run install-tests

---
 .github/workflows/linux-build-and-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux-build-and-test.yaml b/.github/workflows/linux-build-and-test.yaml
index eed565565c3..9d8b82b141a 100644
--- a/.github/workflows/linux-build-and-test.yaml
+++ b/.github/workflows/linux-build-and-test.yaml
@@ -158,6 +158,7 @@ jobs:
         for ext in ${{ matrix.pg_extensions }}; do
           make -C contrib/${ext} install
         done
+        make install-tests
         echo "$HOME/$PG_INSTALL_DIR/bin" >> "${GITHUB_PATH}"
 
     - name: Upload config.log

From 4cbc97dcb7218a8cd4e210be35f74abeb63e377c Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 17 Jul 2026 17:15:32 +0200
Subject: [PATCH 3/3] format

---
 test/pgtest/CMakeLists.txt | 5 ++---
 test/test-defs.cmake       | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/pgtest/CMakeLists.txt b/test/pgtest/CMakeLists.txt
index ce6b8acb440..069696326c3 100644
--- a/test/pgtest/CMakeLists.txt
+++ b/test/pgtest/CMakeLists.txt
@@ -56,9 +56,8 @@ endforeach(IGNORE_TEST)
 # Write the final test schedule
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/schedule ${PG_TEST_SCHEDULE})
 
-set(PG_REGRESS_OPTS_PGTEST
-    --schedule=${CMAKE_CURRENT_BINARY_DIR}/schedule
-    --load-extension=timescaledb)
+set(PG_REGRESS_OPTS_PGTEST --schedule=${CMAKE_CURRENT_BINARY_DIR}/schedule
+                           --load-extension=timescaledb)
 
 add_custom_target(
   pginstallcheck
diff --git a/test/test-defs.cmake b/test/test-defs.cmake
index baef6885f10..f0cfe3433fa 100644
--- a/test/test-defs.cmake
+++ b/test/test-defs.cmake
@@ -72,6 +72,8 @@ file(
   NO_SOURCE_PERMISSIONS
   FILE_PERMISSIONS OWNER_READ OWNER_WRITE)
 
+set(PG_REGRESS_OPTS_BASE)
+
 set(PG_REGRESS_OPTS_EXTRA
     --create-role=${TEST_ROLE_SUPERUSER},${TEST_ROLE_DEFAULT_PERM_USER},${TEST_ROLE_DEFAULT_PERM_USER_2},${TEST_ROLE_1},${TEST_ROLE_2},${TEST_ROLE_3},${TEST_ROLE_4},${TEST_ROLE_READ_ONLY}
     --dbname=${TEST_DBNAME}