mirror of
https://github.com/postgres/postgres.git
synced 2025-04-25 21:42:33 +03:00
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
This commit is contained in:
parent
2977a312df
commit
10ab85254d
@ -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
|
||||
|
@ -284,11 +284,13 @@ check:
|
||||
else
|
||||
check: submake $(REGRESS_PREP)
|
||||
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
|
||||
|
||||
checkprep: EXTRA_INSTALL+=$(subdir)
|
||||
endif
|
||||
endif # REGRESS
|
||||
|
||||
ifndef NO_TEMP_INSTALL
|
||||
checkprep: EXTRA_INSTALL+=$(subdir)
|
||||
endif
|
||||
|
||||
|
||||
# STANDARD RULES
|
||||
|
||||
|
@ -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
|
||||
|
@ -20,5 +20,3 @@ check:
|
||||
|
||||
clean distclean maintainer-clean:
|
||||
rm -rf tmp_check
|
||||
|
||||
EXTRA_INSTALL = contrib/test_decoding
|
||||
|
Loading…
x
Reference in New Issue
Block a user