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

Commit4ae5ee6

Browse files
committed
Extend and improve use of EXTRA_REGRESS_OPTS.
This is now used by ecpg tests, and not clobbered by pg_upgradetests. This change won't affect anything that doesn't set thisenvironment variable, but will enable the buildfarm to controlexactly what port regression test installs will be running on,and thus to detect possible rogue postmasters more easily.Backpatch to release 9.2 where EXTRA_REGRESS_OPTS was first used.
1 parent31f38f2 commit4ae5ee6

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

‎contrib/pg_upgrade/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ if [ "$1" = '--install' ]; then
4747
# We need to make it use psql from our temporary installation,
4848
# because otherwise the installcheck run below would try to
4949
# use psql from the proper installation directory, which might
50-
# be outdated or missing.
51-
EXTRA_REGRESS_OPTS=--psqldir=$bindir
50+
# be outdated or missing. But don't override anything else that's
51+
# already in EXTRA_REGRESS_OPTS.
52+
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --psqldir=$bindir"
5253
export EXTRA_REGRESS_OPTS
5354
fi
5455

‎src/interfaces/ecpg/test/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ $(remaining_files_build): $(abs_builddir)/%: $(srcdir)/%
7575
ln -s$<$@
7676
endif
7777

78+
# Common options for tests. Also pick up anything passed in EXTRA_REGRESS_OPTS
79+
REGRESS_OPTS = --dbname=regress1,connectdb --create-role=connectuser,connectdb$(EXTRA_REGRESS_OPTS)
7880

7981
check: all
80-
./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule--create-role=connectuser,connectdb
82+
./pg_regress$(REGRESS_OPTS) --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule
8183

8284
# the same options, but with --listen-on-tcp
8385
checktcp: all
84-
./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost
86+
./pg_regress$(REGRESS_OPTS) --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
8587

8688
installcheck: all
87-
./pg_regress --psqldir='$(PSQLDIR)' --dbname=regress1,connectdb --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
89+
./pg_regress$(REGRESS_OPTS) --psqldir='$(PSQLDIR)' --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule

0 commit comments

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