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

Commit87cc6b5

Browse files
committed
Respect TEMP_CONFIG when pg_regress_check and friends are called
This reverts commit9117985 in favor ofa more general solution.
1 parentc957813 commit87cc6b5

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

‎contrib/contrib-global.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
# contrib/contrib-global.mk
22

3-
# file with extra config for temp build
4-
ifdefTEMP_CONFIG
5-
REGRESS_OPTS += --temp-config=$(TEMP_CONFIG)
6-
endif
7-
83
NO_PGXS = 1
94
include$(top_srcdir)/src/makefiles/pgxs.mk

‎src/Makefile.global.in

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,14 +524,20 @@ ifdef NO_LOCALE
524524
NOLOCALE += --no-locale
525525
endif
526526

527+
# file with extra config for temp build
528+
TEMP_CONF =
529+
ifdefTEMP_CONFIG
530+
TEMP_CONF += --temp-config=$(TEMP_CONFIG)
531+
endif
532+
527533
pg_regress_locale_flags =$(if$(ENCODING),--encoding=$(ENCODING))$(NOLOCALE)
528534

529-
pg_regress_check =$(with_temp_install)$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-instance=./tmp_check --bindir=$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
535+
pg_regress_check =$(with_temp_install)$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-instance=./tmp_check$(TEMP_CONF)--bindir=$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
530536
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --bindir='$(bindir)'$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
531537

532538
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
533539

534-
pg_isolation_regress_check =$(with_temp_install)$(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) --temp-instance=./tmp_check --bindir=$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
540+
pg_isolation_regress_check =$(with_temp_install)$(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir) --temp-instance=./tmp_check$(TEMP_CONF)--bindir=$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
535541
pg_isolation_regress_installcheck =$(top_builddir)/src/test/isolation/pg_isolation_regress --inputdir=$(srcdir)$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
536542

537543
##########################################################################

‎src/interfaces/ecpg/test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ endif
7878
REGRESS_OPTS = --dbname=regress1,connectdb --create-role=connectuser,connectdb$(EXTRA_REGRESS_OPTS)
7979

8080
check: all
81-
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check --bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule
81+
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check$(TEMP_CONF)--bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule
8282

8383
# the same options, but with --listen-on-tcp
8484
checktcp: all
85-
$(with_temp_install) ./pg_regress$(REGRESS_OPTS) --temp-instance=./tmp_check --bindir=$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
85+
$(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
8888
./pg_regress$(REGRESS_OPTS) --bindir='$(bindir)'$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule

‎src/test/isolation/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ installcheck: all
5555
./pg_isolation_regress --bindir='$(bindir)'$(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
5656

5757
check: all
58-
$(with_temp_install) ./pg_isolation_regress --temp-instance=./tmp_check --inputdir=$(srcdir) --bindir=$(EXTRA_REGRESS_OPTS) --schedule=$(srcdir)/isolation_schedule
58+
$(with_temp_install) ./pg_isolation_regress --temp-instance=./tmp_check$(TEMP_CONF)--inputdir=$(srcdir) --bindir=$(EXTRA_REGRESS_OPTS) --schedule=$(srcdir)/isolation_schedule
5959

6060
# Versions of the check tests that include the prepared_transactions test
6161
# It only makes sense to run these if set up to use prepared transactions,
@@ -65,4 +65,4 @@ installcheck-prepared-txns: all temp-install
6565
./pg_isolation_regress --bindir='$(bindir)'$(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
6666

6767
check-prepared-txns: all temp-install
68-
./pg_isolation_regress --temp-instance=./tmp_check$(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
68+
./pg_isolation_regress --temp-instance=./tmp_check$(TEMP_CONF)$(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions

‎src/test/regress/GNUmakefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ subdir = src/test/regress
1717
top_builddir = ../../..
1818
include$(top_builddir)/src/Makefile.global
1919

20-
# file with extra config for temp build
21-
TEMP_CONF =
22-
ifdefTEMP_CONFIG
23-
TEMP_CONF += --temp-config=$(TEMP_CONFIG)
24-
endif
25-
2620
# maximum simultaneous connections for parallel tests
2721
MAXCONNOPT =
2822
ifdefMAX_CONNECTIONS
@@ -131,10 +125,10 @@ tablespace-setup:
131125
REGRESS_OPTS = --dlpath=.$(EXTRA_REGRESS_OPTS)
132126

133127
check: all tablespace-setup
134-
$(pg_regress_check)$(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule$(MAXCONNOPT)$(TEMP_CONF)$(EXTRA_TESTS)
128+
$(pg_regress_check)$(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule$(MAXCONNOPT)$(EXTRA_TESTS)
135129

136130
check-tests: all tablespace-setup
137-
$(pg_regress_check)$(REGRESS_OPTS)$(MAXCONNOPT)$(TEMP_CONF)$(TESTS)$(EXTRA_TESTS)
131+
$(pg_regress_check)$(REGRESS_OPTS)$(MAXCONNOPT)$(TESTS)$(EXTRA_TESTS)
138132

139133
installcheck: all tablespace-setup
140134
$(pg_regress_installcheck)$(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule$(EXTRA_TESTS)

0 commit comments

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