Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
87cc6b57
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
87cc6b57
编写于
2月 27, 2016
作者:
A
Andrew Dunstan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Respect TEMP_CONFIG when pg_regress_check and friends are called
This reverts commit
9117985b
in favor of a more general solution.
上级
c9578135
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
19 deletion
+14
-19
contrib/contrib-global.mk
contrib/contrib-global.mk
+0
-5
src/Makefile.global.in
src/Makefile.global.in
+8
-2
src/interfaces/ecpg/test/Makefile
src/interfaces/ecpg/test/Makefile
+2
-2
src/test/isolation/Makefile
src/test/isolation/Makefile
+2
-2
src/test/regress/GNUmakefile
src/test/regress/GNUmakefile
+2
-8
未找到文件。
contrib/contrib-global.mk
浏览文件 @
87cc6b57
# contrib/contrib-global.mk
# file with extra config for temp build
ifdef
TEMP_CONFIG
REGRESS_OPTS
+=
--temp-config
=
$(TEMP_CONFIG)
endif
NO_PGXS
=
1
include
$(top_srcdir)/src/makefiles/pgxs.mk
src/Makefile.global.in
浏览文件 @
87cc6b57
...
...
@@ -524,14 +524,20 @@ ifdef NO_LOCALE
NOLOCALE
+=
--no-locale
endif
# file with extra config for temp build
TEMP_CONF
=
ifdef
TEMP_CONFIG
TEMP_CONF
+=
--temp-config
=
$(TEMP_CONFIG)
endif
pg_regress_locale_flags
=
$(
if
$(ENCODING)
,--encoding
=
$(ENCODING)
)
$(NOLOCALE)
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)
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)
pg_regress_installcheck
=
$(top_builddir)
/src/test/regress/pg_regress
--inputdir
=
$(srcdir)
--bindir
=
'
$(bindir)
'
$(pg_regress_locale_flags)
$(EXTRA_REGRESS_OPTS)
pg_regress_clean_files
=
results/ regression.diffs regression.out tmp_check/ log/
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)
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)
pg_isolation_regress_installcheck
=
$(top_builddir)
/src/test/isolation/pg_isolation_regress
--inputdir
=
$(srcdir)
$(pg_regress_locale_flags)
$(EXTRA_REGRESS_OPTS)
##########################################################################
...
...
src/interfaces/ecpg/test/Makefile
浏览文件 @
87cc6b57
...
...
@@ -78,11 +78,11 @@ endif
REGRESS_OPTS
=
--dbname
=
regress1,connectdb
--create-role
=
connectuser,connectdb
$(EXTRA_REGRESS_OPTS)
check
:
all
$(with_temp_install)
./pg_regress
$(REGRESS_OPTS)
--temp-instance
=
./tmp_check
--bindir
=
$(pg_regress_locale_flags)
$(THREAD)
--schedule
=
$(srcdir)
/ecpg_schedule
$(with_temp_install)
./pg_regress
$(REGRESS_OPTS)
--temp-instance
=
./tmp_check
$(TEMP_CONF)
--bindir
=
$(pg_regress_locale_flags)
$(THREAD)
--schedule
=
$(srcdir)
/ecpg_schedule
# the same options, but with --listen-on-tcp
checktcp
:
all
$(with_temp_install)
./pg_regress
$(REGRESS_OPTS)
--temp-instance
=
./tmp_check
--bindir
=
$(pg_regress_locale_flags)
$(THREAD)
--schedule
=
$(srcdir)
/ecpg_schedule_tcp
--host
=
localhost
$(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
installcheck
:
all
./pg_regress
$(REGRESS_OPTS)
--bindir
=
'
$(bindir)
'
$(pg_regress_locale_flags)
$(THREAD)
--schedule
=
$(srcdir)
/ecpg_schedule
src/test/isolation/Makefile
浏览文件 @
87cc6b57
...
...
@@ -55,7 +55,7 @@ installcheck: all
./pg_isolation_regress
--bindir
=
'
$(bindir)
'
$(EXTRA_REGRESS_OPTS)
--inputdir
=
$(srcdir)
--schedule
=
$(srcdir)
/isolation_schedule
check
:
all
$(with_temp_install)
./pg_isolation_regress
--temp-instance
=
./tmp_check
--inputdir
=
$(srcdir)
--bindir
=
$(EXTRA_REGRESS_OPTS)
--schedule
=
$(srcdir)
/isolation_schedule
$(with_temp_install)
./pg_isolation_regress
--temp-instance
=
./tmp_check
$(TEMP_CONF)
--inputdir
=
$(srcdir)
--bindir
=
$(EXTRA_REGRESS_OPTS)
--schedule
=
$(srcdir)
/isolation_schedule
# Versions of the check tests that include the prepared_transactions test
# It only makes sense to run these if set up to use prepared transactions,
...
...
@@ -65,4 +65,4 @@ installcheck-prepared-txns: all temp-install
./pg_isolation_regress
--bindir
=
'
$(bindir)
'
$(EXTRA_REGRESS_OPTS)
--inputdir
=
$(srcdir)
--schedule
=
$(srcdir)
/isolation_schedule prepared-transactions
check-prepared-txns
:
all temp-install
./pg_isolation_regress
--temp-instance
=
./tmp_check
$(EXTRA_REGRESS_OPTS)
--inputdir
=
$(srcdir)
--schedule
=
$(srcdir)
/isolation_schedule prepared-transactions
./pg_isolation_regress
--temp-instance
=
./tmp_check
$(
TEMP_CONF)
$(
EXTRA_REGRESS_OPTS)
--inputdir
=
$(srcdir)
--schedule
=
$(srcdir)
/isolation_schedule prepared-transactions
src/test/regress/GNUmakefile
浏览文件 @
87cc6b57
...
...
@@ -17,12 +17,6 @@ subdir = src/test/regress
top_builddir
=
../../..
include
$(top_builddir)/src/Makefile.global
# file with extra config for temp build
TEMP_CONF
=
ifdef
TEMP_CONFIG
TEMP_CONF
+=
--temp-config
=
$(TEMP_CONFIG)
endif
# maximum simultaneous connections for parallel tests
MAXCONNOPT
=
ifdef
MAX_CONNECTIONS
...
...
@@ -131,10 +125,10 @@ tablespace-setup:
REGRESS_OPTS
=
--dlpath
=
.
$(EXTRA_REGRESS_OPTS)
check
:
all tablespace-setup
$(pg_regress_check)
$(REGRESS_OPTS)
--schedule
=
$(srcdir)
/parallel_schedule
$(MAXCONNOPT)
$(
TEMP_CONF)
$(
EXTRA_TESTS)
$(pg_regress_check)
$(REGRESS_OPTS)
--schedule
=
$(srcdir)
/parallel_schedule
$(MAXCONNOPT)
$(EXTRA_TESTS)
check-tests
:
all tablespace-setup
$(pg_regress_check)
$(REGRESS_OPTS)
$(MAXCONNOPT)
$(TE
MP_CONF)
$(TE
STS)
$(EXTRA_TESTS)
$(pg_regress_check)
$(REGRESS_OPTS)
$(MAXCONNOPT)
$(TESTS)
$(EXTRA_TESTS)
installcheck
:
all tablespace-setup
$(pg_regress_installcheck)
$(REGRESS_OPTS)
--schedule
=
$(srcdir)
/serial_schedule
$(EXTRA_TESTS)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录