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

Commit86ef479

Browse files
committed
build: pass EXTRA_REGRESS_OPTS to secondary regression tests
Christoph Berg
1 parent5043fc8 commit86ef479

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎contrib/pg_upgrade/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include $(top_srcdir)/contrib/contrib-global.mk
2525
endif
2626

2727
check: test.sh all
28-
MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir)$(SHELL)$< --install
28+
MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir)EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)"$(SHELL)$< --install
2929

3030
# disabled because it upsets the build farm
3131
#installcheck: test.sh

‎src/Makefile.global.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,8 @@ endif
458458

459459
pg_regress_locale_flags =$(if$(ENCODING),--encoding=$(ENCODING))$(NOLOCALE)
460460

461-
pg_regress_check =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir)$(pg_regress_locale_flags)
462-
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)'$(pg_regress_locale_flags)
461+
pg_regress_check =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
462+
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)'$(pg_regress_locale_flags)$(EXTRA_REGRESS_OPTS)
463463

464464
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
465465

‎src/test/isolation/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ maintainer-clean: distclean
5252
rm -f specparse.c specscanner.c
5353

5454
installcheck: all
55-
./pg_isolation_regress --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
55+
./pg_isolation_regress --psqldir='$(PSQLDIR)'$(EXTRA_REGRESS_OPTS)--inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
5656

5757
check: all
58-
./pg_isolation_regress --temp-install=./tmp_check --inputdir=$(srcdir) --top-builddir=$(top_builddir) --schedule=$(srcdir)/isolation_schedule
58+
./pg_isolation_regress --temp-install=./tmp_check --inputdir=$(srcdir) --top-builddir=$(top_builddir)$(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,
6262
# via TEMP_CONFIG for the check case, or via the postgresql.conf for the
6363
# installcheck case.
6464
installcheck-prepared-txns: all
65-
./pg_isolation_regress --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
65+
./pg_isolation_regress --psqldir='$(PSQLDIR)'$(EXTRA_REGRESS_OPTS)--inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
6666

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

0 commit comments

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