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).

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index d13742256e69a57c812fc25e89a99e0658780c50..48600611598ca5afb6ada1ffbaa06e7ad5e23c98 100644 (file)
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -80,9 +80,9 @@ REGRESS_OPTS = --dbname=regress1,connectdb --create-role=connectuser,connectdb $
 check: all
    $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --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 --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
+   $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --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 (file)
index 77481b5..0000000
--- 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