aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2017-11-11 14:39:06 -0800
committerNoah Misch <noah@leadboat.com>2017-11-11 14:39:06 -0800
commit1f44160eb720c2bb0fd9f9cafa784c2d53e95a44 (patch)
tree46433190f752a18a1cb76801dcb81622b889ba06 /src
parent3c80348d24914d9ddf65d56d2c343a7f2b820705 (diff)
downloadpostgresql-1f44160eb720c2bb0fd9f9cafa784c2d53e95a44.tar.gz
postgresql-1f44160eb720c2bb0fd9f9cafa784c2d53e95a44.zip
Add post-2010 ecpg tests to checktcp.
This suite had been a proper superset of the regular ecpg test suite, but the three newest tests didn't reach it. To make this less likely to recur, delete the extra schedule file and pass the TCP-specific test on the command line. Back-patch to 9.3 (all supported versions).
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/ecpg/test/Makefile4
-rw-r--r--src/interfaces/ecpg/test/ecpg_schedule_tcp55
2 files changed, 2 insertions, 57 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 22443b4a06e..b9c0cd5fb08 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -80,9 +80,9 @@ REGRESS_OPTS = --dbname=ecpg1_regression,ecpg2_regression --create-role=regress_
check: all
$(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
+# Connect to the server using TCP, and add a TCP-specific test.
checktcp: all | temp-install
- $(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
+ $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --host=localhost connect/test1
installcheck: all
./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
diff --git a/src/interfaces/ecpg/test/ecpg_schedule_tcp b/src/interfaces/ecpg/test/ecpg_schedule_tcp
deleted file mode 100644
index 77481b51477..00000000000
--- a/src/interfaces/ecpg/test/ecpg_schedule_tcp
+++ /dev/null
@@ -1,55 +0,0 @@
-test: compat_informix/dec_test
-test: compat_informix/charfuncs
-test: compat_informix/rfmtdate
-test: compat_informix/rfmtlong
-test: compat_informix/rnull
-test: compat_informix/sqlda
-test: compat_informix/describe
-test: compat_informix/test_informix
-test: compat_informix/test_informix2
-test: connect/test2
-test: connect/test3
-test: connect/test4
-test: connect/test5
-test: pgtypeslib/dt_test
-test: pgtypeslib/dt_test2
-test: pgtypeslib/num_test
-test: pgtypeslib/num_test2
-test: pgtypeslib/nan_test
-test: preproc/array_of_struct
-test: preproc/autoprep
-test: preproc/comment
-test: preproc/cursor
-test: preproc/define
-test: preproc/init
-test: preproc/strings
-test: preproc/type
-test: preproc/variable
-test: preproc/outofscope
-test: preproc/whenever
-test: sql/array
-test: sql/binary
-test: sql/code100
-test: sql/copystdout
-test: sql/define
-test: sql/desc
-test: sql/sqlda
-test: sql/describe
-test: sql/dynalloc
-test: sql/dynalloc2
-test: sql/dyntest
-test: sql/execute
-test: sql/fetch
-test: sql/func
-test: sql/indicators
-test: sql/oldexec
-test: sql/quote
-test: sql/show
-test: sql/insupd
-test: sql/parser
-test: thread/thread
-test: thread/thread_implicit
-test: thread/prep
-test: thread/alloc
-test: thread/descriptor
-test: connect/test1