summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2017-11-23 04:18:15 +0000
committerNoah Misch2017-11-23 04:18:15 +0000
commitde0aca6a82af9c04cb4634d091ab065763fd4d5a (patch)
tree096c9c8271667e3490c2a0fd48c419b458d8b282
parent2393194c0dded22972f03dd53dcbf864dab8ebc6 (diff)
Build src/test/isolation during "make" and "make install".
This hack closes a race condition in "make -j check-world" and "make -j installcheck-world". Back-patch to v10, before which these parallel invocations had worse problems. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/Makefile1
-rw-r--r--src/test/isolation/Makefile7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 380da92c75e..febbcede7d0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,6 +28,7 @@ SUBDIRS = \
pl \
makefiles \
test/regress \
+ test/isolation \
test/perl
# There are too many interdependencies between the subdirectories, so
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 8eb4969e9b8..efbdc40e1d3 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -15,6 +15,13 @@ OBJS = specparse.o isolationtester.o $(WIN32RES)
all: isolationtester$(X) pg_isolation_regress$(X)
+# Though we don't install these binaries, build them during installation
+# (including temp-install). Otherwise, "make -j check-world" and "make -j
+# installcheck-world" would spawn multiple, concurrent builds in this
+# directory. Later builds would overwrite files while earlier builds are
+# reading them, causing occasional failures.
+install: | all
+
submake-regress:
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o