Skip to content

Commit 94d0809

Browse files
committed
tsl/test: pass PG_PKGLIBDIR to provecheck-t's pg_prove.sh invocation
provecheck-t's custom target never set PG_PKGLIBDIR in the environment it invokes pg_prove.sh with, unlike the community provecheck target (test/CMakeLists.txt), which does. pg_prove.sh builds its Perl -I include path from PG_PKGLIBDIR to find PostgreSQL::Test::Cluster: -I "${PG_PKGLIBDIR}/pgxs/src/test/perl" With PG_PKGLIBDIR unset, every TSL TAP test fails immediately with "Can't locate PostgreSQL/Test/Cluster.pm in @inc", on any system where that module isn't also reachable via PG_LIBDIR's own search path (e.g. Debian/Ubuntu PGDG packages, where pg_config --pkglibdir and --libdir point at different directories).
1 parent 77d9d32 commit 94d0809

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tsl/test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ if(TAP_CHECKS)
8282
CONFDIR=${CMAKE_BINARY_DIR}/tsl/test PATH="${PG_BINDIR}:$ENV{PATH}"
8383
PG_REGRESS=${PG_REGRESS} SRC_DIR=${PG_SOURCE_DIR}
8484
CM_SRC_DIR=${CMAKE_SOURCE_DIR} PG_LIBDIR=${PG_LIBDIR}
85-
PG_VERSION_MAJOR=${PG_VERSION_MAJOR} ${PRIMARY_TEST_DIR}/pg_prove.sh
85+
PG_PKGLIBDIR=${PG_PKGLIBDIR} PG_VERSION_MAJOR=${PG_VERSION_MAJOR}
86+
${PRIMARY_TEST_DIR}/pg_prove.sh
8687
USES_TERMINAL)
8788
list(APPEND _install_checks provecheck-t)
8889
elseif(REQUIRE_ALL_TESTS)

0 commit comments

Comments
 (0)