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 diff --git a/test/pgtest/CMakeLists.txt b/test/pgtest/CMakeLists.txt index 93ec3037b47..069696326c3 100644 --- a/test/pgtest/CMakeLists.txt +++ b/test/pgtest/CMakeLists.txt @@ -56,11 +56,8 @@ 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}) +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 c7d6cea7e3d..f0cfe3433fa 100644 --- a/test/test-defs.cmake +++ b/test/test-defs.cmake @@ -72,7 +72,7 @@ file( NO_SOURCE_PERMISSIONS FILE_PERMISSIONS OWNER_READ OWNER_WRITE) -set(PG_REGRESS_OPTS_BASE --dlpath=${PROJECT_BINARY_DIR}/src) +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}