Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10ab852

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_decodingbut that no longer works as of commitaa019da: the macro is nowconsulted by the checkprep target, one level down, and apparentlygmake doesn't propagate such macro settings recursively.The problem is masked since42e61c7 because pgxs.mk also sets upEXTRA_INSTALL, and correctly applies it to the checkprep target.Unfortunately I'd not risked back-patching that to before v11.Sinceaa019da was pushed back to v10, it broke test_decodingthere (the only module for which this actually makes a differenceat present).Hence, back-patch42e61c7 to v10. Also, remove some demonstrablyuseless settings of EXTRA_INSTALL in v10 and v11 (they'd alreadybeen cleaned up in HEAD).Per buildfarm.Discussion:https://postgr.es/m/CAEepm=1pEJdwv6DSGmOfpX0EaX7L7sT28c1nXpqvQvmLfEWb1g@mail.gmail.com
1 parent2977a31 commit10ab852

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
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/makefiles/pgxs.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,12 @@ check:
284284
else
285285
check: submake$(REGRESS_PREP)
286286
$(pg_regress_check)$(REGRESS_OPTS)$(REGRESS)
287+
endif
288+
endif# REGRESS
287289

290+
ifndefNO_TEMP_INSTALL
288291
checkprep: EXTRA_INSTALL+=$(subdir)
289292
endif
290-
endif# REGRESS
291293

292294

293295
# STANDARD RULES

‎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

‎src/test/recovery/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ check:
2020

2121
cleandistcleanmaintainer-clean:
2222
rm -rf tmp_check
23-
24-
EXTRA_INSTALL = contrib/test_decoding

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp