From 384f933046dc9e9a2b416f5f7b3be30b93587c63 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 1 Jul 2013 21:10:36 -0400 Subject: [PATCH] Fix regression test make dependencies The dependencies on the spi and dummy_seclabel contrib modules were incomplete, because they did not pick up automatically generated dependencies on header files. This will manifest itself especially when switching major versions, where the contrib modules would not be recompiled to contain the new version number, leading to regression test failures. To fix this, use the submake approach already in use elsewhere, so that the contrib modules are built using their full rules. --- src/test/regress/GNUmakefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 7309b00114..d5935b6c40 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -111,14 +111,19 @@ autoinc$(DLSUFFIX): $(top_builddir)/contrib/spi/autoinc$(DLSUFFIX) dummy_seclabel$(DLSUFFIX): $(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX) cp $< $@ -$(top_builddir)/contrib/spi/refint$(DLSUFFIX): $(top_srcdir)/contrib/spi/refint.c - $(MAKE) -C $(top_builddir)/contrib/spi refint$(DLSUFFIX) +$(top_builddir)/contrib/spi/refint$(DLSUFFIX): | submake-contrib-spi ; -$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): $(top_srcdir)/contrib/spi/autoinc.c - $(MAKE) -C $(top_builddir)/contrib/spi autoinc$(DLSUFFIX) +$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): | submake-contrib-spi ; -$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX): $(top_builddir)/contrib/dummy_seclabel/dummy_seclabel.c - $(MAKE) -C $(top_builddir)/contrib/dummy_seclabel dummy_seclabel$(DLSUFFIX) +$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX): | submake-contrib-dummy_seclabel ; + +submake-contrib-spi: + $(MAKE) -C $(top_builddir)/contrib/spi + +submake-contrib-dummy_seclabel: + $(MAKE) -C $(top_builddir)/contrib/dummy_seclabel + +.PHONY: submake-contrib-spi submake-contrib-dummy_seclabel # Tablespace setup