From 745948422c799c1b9f976ee30f21a7aac050e0f3 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Wed, 15 Nov 2017 17:49:04 -0500 Subject: [PATCH] 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. --- src/test/modules/Makefile | 1 + src/test/modules/test_session_hooks/Makefile | 4 ++++ src/tools/msvc/vcregress.pl | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/test/modules/Makefile b/src/test/modules/Makefile index b7ed0af021..7246552d38 100644 --- 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 c5c386084e..636ae61c0e 100644 --- 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 719fe83047..41f7832e5a 100644 --- 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; -- 2.40.0