From 10ab85254d28a9347390405ee594d1b2f496912f Mon Sep 17 00:00:00 2001 From: Tom Lane <tgl@sss.pgh.pa.us> Date: Fri, 11 Jan 2019 17:39:30 -0500 Subject: [PATCH] Fix up confusion over how to use EXTRA_INSTALL. Some makefiles were trying to do this: temp-install: EXTRA_INSTALL=contrib/test_decoding but that no longer works as of commit aa019da52: the macro is now consulted by the checkprep target, one level down, and apparently gmake doesn't propagate such macro settings recursively. The problem is masked since 42e61c774 because pgxs.mk also sets up EXTRA_INSTALL, and correctly applies it to the checkprep target. Unfortunately I'd not risked back-patching that to before v11. Since aa019da52 was pushed back to v10, it broke test_decoding there (the only module for which this actually makes a difference at present). Hence, back-patch 42e61c774 to v10. Also, remove some demonstrably useless settings of EXTRA_INSTALL in v10 and v11 (they'd already been cleaned up in HEAD). Per buildfarm. Discussion: https://postgr.es/m/CAEepm=1pEJdwv6DSGmOfpX0EaX7L7sT28c1nXpqvQvmLfEWb1g@mail.gmail.com --- contrib/test_decoding/Makefile | 2 -- src/makefiles/pgxs.mk | 4 +++- src/test/modules/snapshot_too_old/Makefile | 2 -- src/test/recovery/Makefile | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile index 4c4452fc11e..98e2c33a8ae 100644 --- a/contrib/test_decoding/Makefile +++ b/contrib/test_decoding/Makefile @@ -65,5 +65,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_decoding temp .PHONY: submake-test_decoding submake-regress check \ regresscheck regresscheck-install-force \ isolationcheck isolationcheck-install-force - -temp-install: EXTRA_INSTALL=contrib/test_decoding diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index a7b34c69374..a28149455c3 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -284,10 +284,12 @@ check: else check: submake $(REGRESS_PREP) $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) +endif +endif # REGRESS +ifndef NO_TEMP_INSTALL checkprep: EXTRA_INSTALL+=$(subdir) endif -endif # REGRESS # STANDARD RULES diff --git a/src/test/modules/snapshot_too_old/Makefile b/src/test/modules/snapshot_too_old/Makefile index b6d998f3207..05222e2b91a 100644 --- a/src/test/modules/snapshot_too_old/Makefile +++ b/src/test/modules/snapshot_too_old/Makefile @@ -43,5 +43,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_snapshot_too_ $(ISOLATIONCHECKS) .PHONY: check submake-test_snapshot_too_old isolationcheck isolationcheck-install-force - -temp-install: EXTRA_INSTALL=src/test/modules/snapshot_too_old diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile index 142a1b8de2e..e31accf0f58 100644 --- a/src/test/recovery/Makefile +++ b/src/test/recovery/Makefile @@ -20,5 +20,3 @@ check: clean distclean maintainer-clean: rm -rf tmp_check - -EXTRA_INSTALL = contrib/test_decoding -- GitLab