Skip to content

Commit 77d9d32

Browse files
authored
Remove DLPATH manipulation from TimescaleDB build scripts (#10289)
This looks like a workaround for a missing "make install-tests" call when installing Postgres.
1 parent bd9d4e6 commit 77d9d32

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

.github/workflows/linux-build-and-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ jobs:
158158
for ext in ${{ matrix.pg_extensions }}; do
159159
make -C contrib/${ext} install
160160
done
161+
make install-tests
161162
echo "$HOME/$PG_INSTALL_DIR/bin" >> "${GITHUB_PATH}"
162163
163164
- name: Upload config.log

test/pgtest/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@ endforeach(IGNORE_TEST)
5656
# Write the final test schedule
5757
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/schedule ${PG_TEST_SCHEDULE})
5858

59-
# Need --dlpath set to PostgreSQL's test directory so that the tests can load
60-
# libraries there
61-
set(PG_REGRESS_OPTS_PGTEST
62-
--schedule=${CMAKE_CURRENT_BINARY_DIR}/schedule
63-
--load-extension=timescaledb --dlpath=${PG_REGRESS_DIR})
59+
set(PG_REGRESS_OPTS_PGTEST --schedule=${CMAKE_CURRENT_BINARY_DIR}/schedule
60+
--load-extension=timescaledb)
6461

6562
add_custom_target(
6663
pginstallcheck

test/test-defs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ file(
7272
NO_SOURCE_PERMISSIONS
7373
FILE_PERMISSIONS OWNER_READ OWNER_WRITE)
7474

75-
set(PG_REGRESS_OPTS_BASE --dlpath=${PROJECT_BINARY_DIR}/src)
75+
set(PG_REGRESS_OPTS_BASE)
7676

7777
set(PG_REGRESS_OPTS_EXTRA
7878
--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}

0 commit comments

Comments
 (0)