Disable installcheck tests for test_session_hooks

adunstan · adunstan · commit 745948422c79 · 2017-11-15T17:49:04.000-05:00
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 9989f92.
diff --git 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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,8 @@ sub modulescheck`
`383`	`383`	`my $mstat = 0;`
`384`	`384`	`foreach my $module (glob("*"))`
`385`	`385`	`{`
	`386`	`+ # test_session_hooks can't run installcheck, so skip it here`
	`387`	`+ next if $module eq 'test_session_hooks';`
`386`	`388`	`subdircheck("$topdir/src/test/modules", $module);`
`387`	`389`	`my $status = $? >> 8;`
`388`	`390`	`$mstat \|\|= $status;`