Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 384f933

Browse files
committed
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.
1 parent 605b4c5 commit 384f933

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/test/regress/GNUmakefile

+11-6
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,19 @@ autoinc$(DLSUFFIX): $(top_builddir)/contrib/spi/autoinc$(DLSUFFIX)
111111
dummy_seclabel$(DLSUFFIX): $(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX)
112112
cp $< $@
113113

114-
$(top_builddir)/contrib/spi/refint$(DLSUFFIX): $(top_srcdir)/contrib/spi/refint.c
115-
$(MAKE) -C $(top_builddir)/contrib/spi refint$(DLSUFFIX)
114+
$(top_builddir)/contrib/spi/refint$(DLSUFFIX): | submake-contrib-spi ;
116115

117-
$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): $(top_srcdir)/contrib/spi/autoinc.c
118-
$(MAKE) -C $(top_builddir)/contrib/spi autoinc$(DLSUFFIX)
116+
$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): | submake-contrib-spi ;
119117

120-
$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX): $(top_builddir)/contrib/dummy_seclabel/dummy_seclabel.c
121-
$(MAKE) -C $(top_builddir)/contrib/dummy_seclabel dummy_seclabel$(DLSUFFIX)
118+
$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX): | submake-contrib-dummy_seclabel ;
119+
120+
submake-contrib-spi:
121+
$(MAKE) -C $(top_builddir)/contrib/spi
122+
123+
submake-contrib-dummy_seclabel:
124+
$(MAKE) -C $(top_builddir)/contrib/dummy_seclabel
125+
126+
.PHONY: submake-contrib-spi submake-contrib-dummy_seclabel
122127

123128
# Tablespace setup
124129

0 commit comments

Comments
 (0)