Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit99396e6

Browse files
committed
Fix regression test parallel-make hazard.
Back-patch 9.4-era commit384f933 intothe previous branches. Although that was only advertised as repairing aproblem with missed header-file dependencies, it turns out to also beimportant for parallel make safety. The previous coding allowed twoindependent make jobs to get launched concurrently in contrib/spi.Normally this would be OK, because they are building independent targets;but if --enable-depend is in use, it's unsafe, because one make run mighttry to read a .deps file that the other one is in process of rewriting.This is evidently the cause of buildfarm member francolin's recent failurein the 9.2 branch. I believe this patch will result in only one subsidiarymake run, making it safe(r).Report:http://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=francolin&dt=2016-08-12%2017%3A12%3A52
1 parent74ffae9 commit99396e6

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

‎src/test/regress/GNUmakefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,19 @@ autoinc$(DLSUFFIX): $(top_builddir)/contrib/spi/autoinc$(DLSUFFIX)
116116
dummy_seclabel$(DLSUFFIX):$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX)
117117
cp$<$@
118118

119-
$(top_builddir)/contrib/spi/refint$(DLSUFFIX):$(top_srcdir)/contrib/spi/refint.c
120-
$(MAKE) -C$(top_builddir)/contrib/spi refint$(DLSUFFIX)
119+
$(top_builddir)/contrib/spi/refint$(DLSUFFIX): | submake-contrib-spi ;
121120

122-
$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX):$(top_srcdir)/contrib/spi/autoinc.c
123-
$(MAKE) -C$(top_builddir)/contrib/spi autoinc$(DLSUFFIX)
121+
$(top_builddir)/contrib/spi/autoinc$(DLSUFFIX): | submake-contrib-spi ;
124122

125-
$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX):$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel.c
126-
$(MAKE) -C$(top_builddir)/contrib/dummy_seclabel dummy_seclabel$(DLSUFFIX)
123+
$(top_builddir)/contrib/dummy_seclabel/dummy_seclabel$(DLSUFFIX): | submake-contrib-dummy_seclabel ;
124+
125+
submake-contrib-spi:
126+
$(MAKE) -C$(top_builddir)/contrib/spi
127+
128+
submake-contrib-dummy_seclabel:
129+
$(MAKE) -C$(top_builddir)/contrib/dummy_seclabel
130+
131+
.PHONY: submake-contrib-spi submake-contrib-dummy_seclabel
127132

128133
# Tablespace setup
129134

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp