From 869025e0db38a1d041ecd8de669d92f24dbcd131 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 21 May 2019 12:45:03 -0700 Subject: [PATCH v2 2/2] pg_upgrade: Avoid check target accidentally breaking make's --output-sync. When $(MAKE) is present in a rule, make assumes that target is a submake, and it doesn't need to buffer its output. But in this case it's a shell script that needs buffered output. Avoid that heuristic, by referring to $(MAKE) via an indirection. Discussion: https://postgr.es/m/20190521004717.qsktdsugj3shagco@alap3.anarazel.de --- src/bin/pg_upgrade/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index 062afe9938d..70edaade478 100644 --- a/src/bin/pg_upgrade/Makefile +++ b/src/bin/pg_upgrade/Makefile @@ -35,8 +35,17 @@ clean distclean maintainer-clean: pg_upgrade_dump_globals.sql \ pg_upgrade_dump_*.custom pg_upgrade_*.log +# When $(MAKE) is present, make automatically infers that this is a +# recursive make. which is not actually what we want here, as that +# e.g. prevents output synchronization from working (as make things +# that the subsidiary make knows how to deal with that itself, but +# we're invoking a shell script that doesn't know). Referencing +# $(MAKE) indirectly avoids that behaviour. +# See https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html#MAKE-Variable +NOTSUBMAKEMAKE=$(MAKE) + check: test.sh all temp-install - MAKE=$(MAKE) $(with_temp_install) bindir=$(abs_top_builddir)/tmp_install/$(bindir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< $(DOINST) + MAKE=$(NOTSUBMAKEMAKE) $(with_temp_install) bindir=$(abs_top_builddir)/tmp_install/$(bindir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< $(DOINST) # installcheck is not supported because there's no meaningful way to test # pg_upgrade against a single already-running server -- 2.21.0.dirty