Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f285f23

Browse files
committed
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 aa019da: 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 42e61c7 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 aa019da 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 42e61c7 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
1 parent 89d52b9 commit f285f23

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

contrib/test_decoding/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_decoding temp
6565
.PHONY: submake-test_decoding submake-regress check \
6666
regresscheck regresscheck-install-force \
6767
isolationcheck isolationcheck-install-force
68-
69-
temp-install: EXTRA_INSTALL=contrib/test_decoding

src/test/modules/snapshot_too_old/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_snapshot_too_
4343
$(ISOLATIONCHECKS)
4444

4545
.PHONY: check submake-test_snapshot_too_old isolationcheck isolationcheck-install-force
46-
47-
temp-install: EXTRA_INSTALL=src/test/modules/snapshot_too_old

0 commit comments

Comments
 (0)