diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 553c0d697d9a1d4a09a5a0cd7159e43c5a3a44be..9147b7d71e4321fd762165945702e9ac3b9bcf13 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.59 2006/08/28 16:13:11 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.60 2006/08/29 12:33:45 meskes Exp $ subdir = src/interfaces/ecpg/test top_builddir = ../../../.. @@ -76,11 +76,11 @@ endif check: all - sh ./pg_regress --dbname=regress1 --debug --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) + sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) # the same options, but with --listen-on-tcp checktcp: all - sh ./pg_regress --dbname=regress1 --debug --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp + sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp installcheck: all - sh ./pg_regress --dbname=regress1 --debug --top-builddir=$(top_builddir) --load-language=plpgsql $(NOLOCALE) + sh ./pg_regress --dbname=regress1 --top-builddir=$(top_builddir) --load-language=plpgsql $(NOLOCALE) diff --git a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c index 76e321af153e7a667a40bf2556af9292be8e61bb..cb51daaf0bf27112977065901816387730030a75 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c @@ -17,7 +17,7 @@ #include <sqltypes.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rnull.c b/src/interfaces/ecpg/test/expected/compat_informix-rnull.c index 9ee19ace763d629e51da9afd044aa1d5948aacbb..74fcfc74a71e19fb82e6a4ee41160e981b3b0e48 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-rnull.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-rnull.c @@ -13,7 +13,7 @@ #include <stdlib.h> # -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c index 53e39a008d791c80f225a95974f9f65d917e630d..749f4bf56ae41defcb7dd20cbfe32cbdac414132 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c @@ -13,7 +13,7 @@ #include <stdlib.h> # -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c index 12c34203fa5316b88bec9c9bb20f5900b9193cce..d5c2c59ea43109f38c20cfeefcba145ede0a781e 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c @@ -14,7 +14,7 @@ #include "sqltypes.h" -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -85,7 +85,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 5 "test_informix2.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/complex-test1.c b/src/interfaces/ecpg/test/expected/complex-test1.c index 82a3df9559fbe30818970d95d0d15c89d3ed6ee5..7f6e8db351d13f575fabe59dfdff878840e560c3 100644 --- a/src/interfaces/ecpg/test/expected/complex-test1.c +++ b/src/interfaces/ecpg/test/expected/complex-test1.c @@ -13,7 +13,7 @@ #include <stdio.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/complex-test2.c b/src/interfaces/ecpg/test/expected/complex-test2.c index d11a1c333736d909b9dd806700fced6176188fdf..bd27430f63b928ce8b5f468dfb35457b11cec35c 100644 --- a/src/interfaces/ecpg/test/expected/complex-test2.c +++ b/src/interfaces/ecpg/test/expected/complex-test2.c @@ -11,7 +11,7 @@ #include <string.h> -#line 1 "header_test.h" +#line 1 "./header_test.h" #include "stdlib.h" static void @@ -22,19 +22,19 @@ Finish(char *msg) /* finish transaction */ { ECPGtrans(__LINE__, NULL, "rollback");} -#line 10 "header_test.h" +#line 10 "./header_test.h" /* and remove test table */ { ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT);} -#line 13 "header_test.h" +#line 13 "./header_test.h" { ECPGtrans(__LINE__, NULL, "commit");} -#line 14 "header_test.h" +#line 14 "./header_test.h" { ECPGdisconnect(__LINE__, "CURRENT");} -#line 16 "header_test.h" +#line 16 "./header_test.h" exit(-1); @@ -47,16 +47,16 @@ warn(void) } /* exec sql whenever sqlerror do Finish ( msg ) ; */ -#line 29 "header_test.h" +#line 29 "./header_test.h" /* exec sql whenever sql_warning do warn ( ) ; */ -#line 32 "header_test.h" +#line 32 "./header_test.h" #line 4 "test2.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/complex-test3.c b/src/interfaces/ecpg/test/expected/complex-test3.c index ab4c33def1a287a37cf93012b51672be68b683d3..05a6b06232088277ab1ee211d864f4d291ff9e0b 100644 --- a/src/interfaces/ecpg/test/expected/complex-test3.c +++ b/src/interfaces/ecpg/test/expected/complex-test3.c @@ -11,7 +11,7 @@ /* Test comment */ /*--------------------------------------------------------------------------*/ -#line 1 "header_test.h" +#line 1 "./header_test.h" #include "stdlib.h" static void @@ -22,19 +22,19 @@ Finish(char *msg) /* finish transaction */ { ECPGtrans(__LINE__, NULL, "rollback");} -#line 10 "header_test.h" +#line 10 "./header_test.h" /* and remove test table */ { ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT);} -#line 13 "header_test.h" +#line 13 "./header_test.h" { ECPGtrans(__LINE__, NULL, "commit");} -#line 14 "header_test.h" +#line 14 "./header_test.h" { ECPGdisconnect(__LINE__, "CURRENT");} -#line 16 "header_test.h" +#line 16 "./header_test.h" exit(-1); @@ -47,16 +47,16 @@ warn(void) } /* exec sql whenever sqlerror do Finish ( msg ) ; */ -#line 29 "header_test.h" +#line 29 "./header_test.h" /* exec sql whenever sql_warning do warn ( ) ; */ -#line 32 "header_test.h" +#line 32 "./header_test.h" #line 4 "test3.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/complex-test4.c b/src/interfaces/ecpg/test/expected/complex-test4.c index d56b1954c7c7a5c399d81e3b08210cf54f9bf28d..9ac0fe0d25ced17ed9865f86fff042bb60c38bfd 100644 --- a/src/interfaces/ecpg/test/expected/complex-test4.c +++ b/src/interfaces/ecpg/test/expected/complex-test4.c @@ -16,7 +16,7 @@ -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -87,7 +87,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 7 "test4.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/complex-test5.c b/src/interfaces/ecpg/test/expected/complex-test5.c index 337a5d8984ba619a0489865f9337d6f5c71ec5fb..19cd5ce472b1ba51cbfe0c1c13c6fba7e3e6b5d4 100644 --- a/src/interfaces/ecpg/test/expected/complex-test5.c +++ b/src/interfaces/ecpg/test/expected/complex-test5.c @@ -11,7 +11,7 @@ #include <stdlib.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/connect-test2.c b/src/interfaces/ecpg/test/expected/connect-test2.c index ce18b08bf89664cb4ab59f74c3c20e004ec0de1b..731f203b60eac7804db4060f29a2d2b32ac6fa28 100644 --- a/src/interfaces/ecpg/test/expected/connect-test2.c +++ b/src/interfaces/ecpg/test/expected/connect-test2.c @@ -18,7 +18,7 @@ #include <stdio.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/connect-test3.c b/src/interfaces/ecpg/test/expected/connect-test3.c index 5e4451a4c5740ae35629f21915a4c02267edb56e..32d24bedf4898e94724ed17a22f5b7b129765bbf 100644 --- a/src/interfaces/ecpg/test/expected/connect-test3.c +++ b/src/interfaces/ecpg/test/expected/connect-test3.c @@ -17,7 +17,7 @@ #include <stdio.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/connect-test4.c b/src/interfaces/ecpg/test/expected/connect-test4.c index ba15660f336bf82f881c3ab5465b4aa639d37354..34388ebde23a0235053de399e713303376d4b740 100644 --- a/src/interfaces/ecpg/test/expected/connect-test4.c +++ b/src/interfaces/ecpg/test/expected/connect-test4.c @@ -13,7 +13,7 @@ #include <stdio.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/errors-init.c b/src/interfaces/ecpg/test/expected/errors-init.c index 0d085b140dd3cc7ae7728c630e0f30545630b0f4..c546ee34251bdfd6a9686ec56d8e5404ad94b933 100644 --- a/src/interfaces/ecpg/test/expected/errors-init.c +++ b/src/interfaces/ecpg/test/expected/errors-init.c @@ -8,7 +8,7 @@ #line 1 "init.pgc" -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c index 0ce27f4596d36267478f7cbb0b1d89a53c3e78eb..ed734e54497ed42f1717c7f1297a48728d1cfd98 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c @@ -15,7 +15,7 @@ #include <pgtypes_interval.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c index 805f50f7e81fdf9f7c7153e26f3a55dc9c802a6c..9df8b9b14d145a061523732849c8cb9d79759d0a 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c @@ -14,7 +14,7 @@ #include <pgtypes_timestamp.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c index e997a2ce4efc841e35c6b7bc3b8da4020b5bff38..68fb3b9320cc1f62192201d672098c98a6f32388 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c @@ -13,7 +13,7 @@ #include <decimal.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c index df7a39898a4836b919d034408ff51d4648dd2e0f..3d7468678ceca4637ca805e2034763045a49a47f 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c @@ -14,7 +14,7 @@ #include <decimal.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-code100.c b/src/interfaces/ecpg/test/expected/sql-code100.c index 88bb07925a94c5b4511cb195819f44c03eeadccc..7a80e7e48d34abe78c45142fb4ca85c0b0353734 100644 --- a/src/interfaces/ecpg/test/expected/sql-code100.c +++ b/src/interfaces/ecpg/test/expected/sql-code100.c @@ -8,7 +8,7 @@ #line 1 "code100.pgc" -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -81,7 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #include <stdio.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-copystdout.c b/src/interfaces/ecpg/test/expected/sql-copystdout.c index 8e14452872867d9f44d1650c94d7f6c93d3e6e38..13ca096d9c74ba8da76617a56f8bce895b850349 100644 --- a/src/interfaces/ecpg/test/expected/sql-copystdout.c +++ b/src/interfaces/ecpg/test/expected/sql-copystdout.c @@ -10,7 +10,7 @@ #include <stdio.h> -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -81,7 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 3 "copystdout.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-define.c b/src/interfaces/ecpg/test/expected/sql-define.c index 44cd13bedb3e949b8ad1a27c48d7e6dd2a842e74..323977a0720a9b787e1e78d9950f95e74a66add4 100644 --- a/src/interfaces/ecpg/test/expected/sql-define.c +++ b/src/interfaces/ecpg/test/expected/sql-define.c @@ -8,7 +8,7 @@ #line 1 "define.pgc" -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -79,7 +79,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 1 "define.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-desc.c b/src/interfaces/ecpg/test/expected/sql-desc.c index d1c776fca1d18f37a7cffc956cc6ff117df06e95..2ca755b3a0b55ddab4ca4a106ed61acf9bb452b2 100644 --- a/src/interfaces/ecpg/test/expected/sql-desc.c +++ b/src/interfaces/ecpg/test/expected/sql-desc.c @@ -8,7 +8,7 @@ #line 1 "desc.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.c b/src/interfaces/ecpg/test/expected/sql-dynalloc.c index 77cfa52b199bba783c508cb5e0a7b2de5027e718..227a313a36424951a5d15aff8505c6fea76e4a36 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.c @@ -9,7 +9,7 @@ #line 1 "dynalloc.pgc" #include <stdio.h> -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -81,7 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #include <stdlib.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c index 69d9446169aa103f3840d123234862b38f74093c..b2b83cf0c7860480538c8810f56acbcaf6ef3f6f 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c @@ -9,7 +9,7 @@ #line 1 "dynalloc2.pgc" #include <stdio.h> -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -81,7 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #include <stdlib.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-dyntest.c b/src/interfaces/ecpg/test/expected/sql-dyntest.c index 5ecd7c65183c4a69d01274a4f3d9e5d5d46e1706..fea69b953592d0cca02f485290380d88a3294efd 100644 --- a/src/interfaces/ecpg/test/expected/sql-dyntest.c +++ b/src/interfaces/ecpg/test/expected/sql-dyntest.c @@ -14,7 +14,7 @@ #include <stdlib.h> -#line 1 "sql3types.h" +#line 1 "./../../include/sql3types.h" #ifndef _ECPG_SQL3TYPES_H #define _ECPG_SQL3TYPES_H @@ -62,7 +62,7 @@ enum #line 7 "dyntest.pgc" -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -133,7 +133,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 8 "dyntest.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-func.c b/src/interfaces/ecpg/test/expected/sql-func.c index 6f8bf3a17fb79da0afde1c776886e5917551a805..0e960ea352cec3ce088ad91a3a82fa16e1a34bea 100644 --- a/src/interfaces/ecpg/test/expected/sql-func.c +++ b/src/interfaces/ecpg/test/expected/sql-func.c @@ -12,7 +12,7 @@ #include <string.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-indicators.c b/src/interfaces/ecpg/test/expected/sql-indicators.c index cc7054d47311c6d6196f1c7869a568fde9c9ba1b..73a4eaef8e4e475b6b7ec9ce2b32d3da148b0d78 100644 --- a/src/interfaces/ecpg/test/expected/sql-indicators.c +++ b/src/interfaces/ecpg/test/expected/sql-indicators.c @@ -10,7 +10,7 @@ #include <stdio.h> -#line 1 "sqlca.h" +#line 1 "./../../include/sqlca.h" #ifndef POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H @@ -81,7 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #line 3 "indicators.pgc" -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-quote.c b/src/interfaces/ecpg/test/expected/sql-quote.c index 5c2dceb4d03b0ced238543496ee5f52e82de4353..9868fef9ab85512a53131eb18d915b42dee9cdad 100644 --- a/src/interfaces/ecpg/test/expected/sql-quote.c +++ b/src/interfaces/ecpg/test/expected/sql-quote.c @@ -12,7 +12,7 @@ #include <string.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/sql-show.c b/src/interfaces/ecpg/test/expected/sql-show.c index e5c906b45eb89d831957659aefcb0d4508fa8688..46fadb436a3385417659e5a7afad50c840905738 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.c +++ b/src/interfaces/ecpg/test/expected/sql-show.c @@ -12,7 +12,7 @@ #include <string.h> -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c index 96be500f6f13ff6d50b37097b1d3133cbad951b3..0df8272907d886f8a8313c09e8c3687fc852765e 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread.c +++ b/src/interfaces/ecpg/test/expected/thread-thread.c @@ -26,7 +26,7 @@ main(void) -#line 1 "regression.h" +#line 1 "./../regression.h" diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c index b2a95d54006fadfca78a00b24df5b200e39c3449..22a666f52e9c8ca7bbf66389c157bbeb4d89536d 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c +++ b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c @@ -27,7 +27,7 @@ main(void) -#line 1 "regression.h" +#line 1 "./../regression.h"