Try to unbreak injection-fault tests in the buildfarm

The buildfarm script attempts to run all tests marked as
NO_INSTALLCHECK under src/test/modules without paying attention to
whether they are enabled or disabled in the parent Makefile. That
hasn't been a problem so far, because all the tests marked with
NO_INSTALLCHECK ran unconditionally in "make check". But commit
e2e3b8ae9e changed that: the injection fault tests are marked as
NO_INSTALLCHECK, and also depend on --enable-injection-points.

Try to work around that by ensuring that "make check" does nothing in
the those subdirectories. We can hopefully get rid of this hack soon,
after fixing the buildfarm client, or by switching to meson.

Discussion: https://www.postgresql.org/message-id/8e4cf596-dd70-432e-9068-16466ed596ed%40iki.fi

diff --git a/src/test/modules/gin/Makefile b/src/test/modules/gin/Makefile
index 81ca6bfe35a50781372248a453f45cd6d7939fd2..da4c9cea5ef1a7549621e0ea1a5d80d65d171aaa 100644 (file)
--- a/src/test/modules/gin/Makefile
+++ b/src/test/modules/gin/Makefile
@@ -15,5 +15,17 @@ else
 subdir = src/test/modules/gin
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
+
+# XXX: This test is conditional on enable_injection_points in the
+# parent Makefile, so we should never get here in the first place if
+# injection points are not enabled. But the buildfarm 'misc-check'
+# step doesn't pay attention to the if-condition in the parent
+# Makefile. To work around that, disable running the test here too.
+ifeq ($(enable_injection_points),yes)
 include $(top_srcdir)/contrib/contrib-global.mk
+else
+check:
+   @echo "injection points are disabled in this build"
+endif
+
 endif

diff --git a/src/test/modules/injection_points/Makefile b/src/test/modules/injection_points/Makefile
index 4248671513a5b644abcdf37995dd0b80697e9bde..1cb395c37acb200d7a62280fa4c8eec32fdc2b50 100644 (file)
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@ -19,5 +19,17 @@ else
 subdir = src/test/modules/injection_points
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
+
+# XXX: This test is conditional on enable_injection_points in the
+# parent Makefile, so we should never get here in the first place if
+# injection points are not enabled. But the buildfarm 'misc-check'
+# step doesn't pay attention to the if-condition in the parent
+# Makefile. To work around that, disable running the test here too.
+ifeq ($(enable_injection_points),yes)
 include $(top_srcdir)/contrib/contrib-global.mk
+else
+check:
+   @echo "injection points are disabled in this build"
+endif
+
 endif