Disable installcheck tests for test_session_hooks

The module requires a preloaded library and the defect can't be cured by
a LOAD instruction in the test script. To achieve this we override the
installcheck target in the module's Makefile, and exclude ithe module in
vcregress.pl.

Along the way, revert commit 9989f92aabd.

diff --git a/src/test/modules/Makefile b/src/test/modules/Makefile
index b7ed0af021f6306741428aadef69d455d9d7601a..7246552d3860feee4936d80bac0a2d9c3ac6773d 100644 (file)
--- a/src/test/modules/Makefile
+++ b/src/test/modules/Makefile
@@ -15,6 +15,7 @@ SUBDIRS = \
          test_pg_dump \
          test_rbtree \
          test_rls_hooks \
+         test_session_hooks \
          test_shm_mq \
          worker_spi
 

diff --git a/src/test/modules/test_session_hooks/Makefile b/src/test/modules/test_session_hooks/Makefile
index c5c386084e73ac7bc152f5a09a07cd0f25a1ac3c..636ae61c0e1f582e43113cc501be736f6dbc83bf 100644 (file)
--- a/src/test/modules/test_session_hooks/Makefile
+++ b/src/test/modules/test_session_hooks/Makefile
@@ -19,3 +19,7 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+# override installcheck - this module requires preloading the test module
+installcheck:
+   @echo Cannot run $@ for test_session_hooks. Run "'make check'" instead.

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 719fe830476015dbbbee3c778dbea2390c21030f..41f7832e5a65567e668cebd315d741581ce07357 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -383,6 +383,8 @@ sub modulescheck
    my $mstat = 0;
    foreach my $module (glob("*"))
    {
+       # test_session_hooks can't run installcheck, so skip it here
+       next if $module eq 'test_session_hooks';
        subdircheck("$topdir/src/test/modules", $module);
        my $status = $? >> 8;
        $mstat ||= $status;