From 67135eb1effad9496864c8be08eea2e76d2c6387 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Tue, 29 Aug 2006 12:33:45 +0000 Subject: [PATCH] Removed debug option from pg_regress call. Changed file paths in expected files too. --- src/interfaces/ecpg/test/Makefile | 8 ++++---- .../test/expected/compat_informix-dec_test.c | 2 +- .../ecpg/test/expected/compat_informix-rnull.c | 2 +- .../expected/compat_informix-test_informix.c | 2 +- .../expected/compat_informix-test_informix2.c | 4 ++-- .../ecpg/test/expected/complex-test1.c | 2 +- .../ecpg/test/expected/complex-test2.c | 16 ++++++++-------- .../ecpg/test/expected/complex-test3.c | 16 ++++++++-------- .../ecpg/test/expected/complex-test4.c | 4 ++-- .../ecpg/test/expected/complex-test5.c | 2 +- .../ecpg/test/expected/connect-test2.c | 2 +- .../ecpg/test/expected/connect-test3.c | 2 +- .../ecpg/test/expected/connect-test4.c | 2 +- src/interfaces/ecpg/test/expected/errors-init.c | 2 +- .../ecpg/test/expected/pgtypeslib-dt_test.c | 2 +- .../ecpg/test/expected/pgtypeslib-dt_test2.c | 2 +- .../ecpg/test/expected/pgtypeslib-num_test.c | 2 +- .../ecpg/test/expected/pgtypeslib-num_test2.c | 2 +- src/interfaces/ecpg/test/expected/sql-code100.c | 4 ++-- .../ecpg/test/expected/sql-copystdout.c | 4 ++-- src/interfaces/ecpg/test/expected/sql-define.c | 4 ++-- src/interfaces/ecpg/test/expected/sql-desc.c | 2 +- src/interfaces/ecpg/test/expected/sql-dynalloc.c | 4 ++-- .../ecpg/test/expected/sql-dynalloc2.c | 4 ++-- src/interfaces/ecpg/test/expected/sql-dyntest.c | 6 +++--- src/interfaces/ecpg/test/expected/sql-func.c | 2 +- .../ecpg/test/expected/sql-indicators.c | 4 ++-- src/interfaces/ecpg/test/expected/sql-quote.c | 2 +- src/interfaces/ecpg/test/expected/sql-show.c | 2 +- .../ecpg/test/expected/thread-thread.c | 2 +- .../ecpg/test/expected/thread-thread_implicit.c | 2 +- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 553c0d697d..9147b7d71e 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 76e321af15..cb51daaf0b 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 -#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 9ee19ace76..74fcfc74a7 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 # -#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 53e39a008d..749f4bf56a 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 # -#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 12c34203fa..d5c2c59ea4 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 82a3df9559..7f6e8db351 100644 --- a/src/interfaces/ecpg/test/expected/complex-test1.c +++ b/src/interfaces/ecpg/test/expected/complex-test1.c @@ -13,7 +13,7 @@ #include -#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 d11a1c3337..bd27430f63 100644 --- a/src/interfaces/ecpg/test/expected/complex-test2.c +++ b/src/interfaces/ecpg/test/expected/complex-test2.c @@ -11,7 +11,7 @@ #include -#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 ab4c33def1..05a6b06232 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 d56b1954c7..9ac0fe0d25 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 337a5d8984..19cd5ce472 100644 --- a/src/interfaces/ecpg/test/expected/complex-test5.c +++ b/src/interfaces/ecpg/test/expected/complex-test5.c @@ -11,7 +11,7 @@ #include -#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 ce18b08bf8..731f203b60 100644 --- a/src/interfaces/ecpg/test/expected/connect-test2.c +++ b/src/interfaces/ecpg/test/expected/connect-test2.c @@ -18,7 +18,7 @@ #include -#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 5e4451a4c5..32d24bedf4 100644 --- a/src/interfaces/ecpg/test/expected/connect-test3.c +++ b/src/interfaces/ecpg/test/expected/connect-test3.c @@ -17,7 +17,7 @@ #include -#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 ba15660f33..34388ebde2 100644 --- a/src/interfaces/ecpg/test/expected/connect-test4.c +++ b/src/interfaces/ecpg/test/expected/connect-test4.c @@ -13,7 +13,7 @@ #include -#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 0d085b140d..c546ee3425 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 0ce27f4596..ed734e5449 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 -#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 805f50f7e8..9df8b9b14d 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 -#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 e997a2ce4e..68fb3b9320 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 -#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 df7a39898a..3d7468678c 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 -#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 88bb07925a..7a80e7e48d 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 -#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 8e14452872..13ca096d9c 100644 --- a/src/interfaces/ecpg/test/expected/sql-copystdout.c +++ b/src/interfaces/ecpg/test/expected/sql-copystdout.c @@ -10,7 +10,7 @@ #include -#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 44cd13bedb..323977a072 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 d1c776fca1..2ca755b3a0 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 77cfa52b19..227a313a36 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 -#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 -#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 69d9446169..b2b83cf0c7 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 -#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 -#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 5ecd7c6518..fea69b9535 100644 --- a/src/interfaces/ecpg/test/expected/sql-dyntest.c +++ b/src/interfaces/ecpg/test/expected/sql-dyntest.c @@ -14,7 +14,7 @@ #include -#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 6f8bf3a17f..0e960ea352 100644 --- a/src/interfaces/ecpg/test/expected/sql-func.c +++ b/src/interfaces/ecpg/test/expected/sql-func.c @@ -12,7 +12,7 @@ #include -#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 cc7054d473..73a4eaef8e 100644 --- a/src/interfaces/ecpg/test/expected/sql-indicators.c +++ b/src/interfaces/ecpg/test/expected/sql-indicators.c @@ -10,7 +10,7 @@ #include -#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 5c2dceb4d0..9868fef9ab 100644 --- a/src/interfaces/ecpg/test/expected/sql-quote.c +++ b/src/interfaces/ecpg/test/expected/sql-quote.c @@ -12,7 +12,7 @@ #include -#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 e5c906b45e..46fadb436a 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.c +++ b/src/interfaces/ecpg/test/expected/sql-show.c @@ -12,7 +12,7 @@ #include -#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 96be500f6f..0df8272907 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 b2a95d5400..22a666f52e 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" -- 2.40.0