From 839fcc9fd09452c406b67fb2e1af87d55d0ad4e2 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 15 Jun 2007 08:23:52 +0000
Subject: [PATCH] Applied patch by Joachim to enable checktcp again
---
src/interfaces/ecpg/test/Makefile | 4 +-
src/interfaces/ecpg/test/ecpg_schedule_tcp | 42 +++++++++++++++++++
.../ecpg/test/expected/connect-test1.c.in | 8 ++--
3 files changed, 48 insertions(+), 6 deletions(-)
create mode 100644 src/interfaces/ecpg/test/ecpg_schedule_tcp
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index a0c8bedb166..491cd2ff01e 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.70 2007/06/12 15:00:41 alvherre Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.71 2007/06/15 08:23:52 meskes Exp $
subdir = src/interfaces/ecpg/test
top_builddir = ../../../..
@@ -92,7 +92,7 @@ check: all
# the same options, but with --listen-on-tcp
checktcp: all
- ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb --host=localhost
+ ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost
installcheck: all
./pg_regress --psqldir=$(PSQLDIR) --dbname=regress1,connectdb --top-builddir=$(top_builddir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
diff --git a/src/interfaces/ecpg/test/ecpg_schedule_tcp b/src/interfaces/ecpg/test/ecpg_schedule_tcp
new file mode 100644
index 00000000000..62c26a1cabd
--- /dev/null
+++ b/src/interfaces/ecpg/test/ecpg_schedule_tcp
@@ -0,0 +1,42 @@
+test: compat_informix/dec_test
+test: compat_informix/charfuncs
+test: compat_informix/rfmtdate
+test: compat_informix/rfmtlong
+test: compat_informix/rnull
+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: preproc/comment
+test: preproc/define
+test: preproc/init
+test: preproc/type
+test: preproc/variable
+test: preproc/whenever
+test: sql/array
+test: sql/binary
+test: sql/code100
+test: sql/copystdout
+test: sql/define
+test: sql/desc
+test: sql/dynalloc
+test: sql/dynalloc2
+test: sql/dyntest
+test: sql/execute
+test: sql/fetch
+test: sql/func
+test: sql/indicators
+test: sql/quote
+test: sql/show
+test: sql/insupd
+test: sql/parser
+test: thread/thread
+test: thread/thread_implicit
+test: connect/test1
+
diff --git a/src/interfaces/ecpg/test/expected/connect-test1.c.in b/src/interfaces/ecpg/test/expected/connect-test1.c.in
index f37475199e4..3bad2edfd4a 100644
--- a/src/interfaces/ecpg/test/expected/connect-test1.c.in
+++ b/src/interfaces/ecpg/test/expected/connect-test1.c.in
@@ -37,7 +37,7 @@ main(void)
ECPGdebug(1, stderr);
- { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); }
+ { ECPGconnect(__LINE__, 0, "connectdb" , NULL, NULL , "main", 0); }
#line 22 "test1.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
@@ -47,7 +47,7 @@ main(void)
#line 24 "test1.pgc"
/* <-- "main" not specified */
- { ECPGconnect(__LINE__, 0, "connectdb@localhost" , NULL,NULL , "main", 0); }
+ { ECPGconnect(__LINE__, 0, "connectdb@localhost" , NULL, NULL , "main", 0); }
#line 26 "test1.pgc"
{ ECPGdisconnect(__LINE__, "main");}
@@ -61,7 +61,7 @@ main(void)
#line 30 "test1.pgc"
- { ECPGconnect(__LINE__, 0, "connectdb@localhost:@TEMP_PORT@" , NULL,NULL , "main", 0); }
+ { ECPGconnect(__LINE__, 0, "connectdb@localhost:@TEMP_PORT@" , NULL, NULL , "main", 0); }
#line 32 "test1.pgc"
{ ECPGdisconnect(__LINE__, "main");}
@@ -75,7 +75,7 @@ main(void)
#line 36 "test1.pgc"
- { ECPGconnect(__LINE__, 0, "connectdb:@TEMP_PORT@" , NULL,NULL , "main", 0); }
+ { ECPGconnect(__LINE__, 0, "connectdb:@TEMP_PORT@" , NULL, NULL , "main", 0); }
#line 38 "test1.pgc"
{ ECPGdisconnect(__LINE__, "main");}
--
GitLab