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

Commit937f678

Browse files
committed
Add a temp-install prerequisite to "check"-like targets not having one.
Makefile.global assigns this prerequisite to every target named "check",but similar targets must mention it explicitly. Affected targetsfailed, tested $PATH binaries, or tested a stale temporary installation.The src/test/modules examples worked properly when called as "make -Csrc/test/modules/$FOO check", but "make -j" allowed the test to startbefore the temporary installation was in place. Back-patch to 9.5,where commitdcae5fa introduced theshared temp-install.
1 parent8135c3c commit937f678

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

‎src/interfaces/ecpg/test/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ check: all
8181
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check$(TEMP_CONF) --bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
8282

8383
# the same options, but with --listen-on-tcp
84-
checktcp: all
84+
checktcp: all | temp-install
8585
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check$(TEMP_CONF) --bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
8686

8787
installcheck: all
@@ -95,5 +95,5 @@ installcheck: all
9595
installcheck-prepared-txns: all
9696
./pg_regress$(REGRESS_OPTS) --bindir='$(bindir)'$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
9797

98-
check-prepared-txns: all
98+
check-prepared-txns: all | temp-install
9999
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check$(TEMP_CONF) --bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase

‎src/test/locale/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ clean distclean maintainer-clean:
1616
$(MAKE) -C$$d clean||exit;\
1717
done
1818

19+
# These behave like installcheck targets.
1920
check-%: all
2021
@$(MAKE) -C`echo$@| sed's/^check-//'`test

‎src/test/modules/brin/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ endif
2121

2222
check: isolation-check prove-check
2323

24-
isolation-check: | submake-isolation
24+
isolation-check: | submake-isolation temp-install
2525
$(MKDIR_P) isolation_output
2626
$(pg_isolation_regress_check)\
2727
--outputdir=./isolation_output\
2828
$(ISOLATIONCHECKS)
2929

30-
prove-check:
30+
prove-check: | temp-install
3131
$(prove_check)
3232

3333
.PHONY: check isolation-check prove-check

‎src/test/modules/commit_ts/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ endif
1616

1717
check: prove-check
1818

19-
prove-check:
19+
prove-check: | temp-install
2020
$(prove_check)

‎src/test/modules/test_pg_dump/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ endif
2121

2222
check: prove-check
2323

24-
prove-check:
24+
prove-check: | temp-install
2525
$(prove_check)

‎src/test/regress/GNUmakefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
129129
check: all tablespace-setup
130130
$(pg_regress_check)$(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule$(MAXCONNOPT)$(EXTRA_TESTS)
131131

132-
check-tests: all tablespace-setup
132+
check-tests: all tablespace-setup | temp-install
133133
$(pg_regress_check)$(REGRESS_OPTS)$(MAXCONNOPT)$(TESTS)$(EXTRA_TESTS)
134134

135135
installcheck: all tablespace-setup
@@ -153,7 +153,7 @@ runtest-parallel: installcheck-parallel
153153
bigtest: all tablespace-setup
154154
$(pg_regress_installcheck)$(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
155155

156-
bigcheck: all tablespace-setup
156+
bigcheck: all tablespace-setup | temp-install
157157
$(pg_regress_check)$(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule$(MAXCONNOPT) numeric_big
158158

159159

0 commit comments

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