Removed debug option from pg_regress call.

Michael Meskes · Michael Meskes · commit 67135eb1effa · 2006-08-29T12:33:45.000Z
Changed file paths in expected files too.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/interfaces/ecpg/test/expected/sql-func.c b/src/interfaces/ecpg/test/expected/sql-func.c
diff --git a/src/interfaces/ecpg/test/expected/sql-indicators.c b/src/interfaces/ecpg/test/expected/sql-indicators.c
diff --git a/src/interfaces/ecpg/test/expected/sql-quote.c b/src/interfaces/ecpg/test/expected/sql-quote.c
diff --git a/src/interfaces/ecpg/test/expected/sql-show.c b/src/interfaces/ecpg/test/expected/sql-show.c
diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c
diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include <sqltypes.h>`
`18`	`18`
`19`	`19`
`20`		`-#line 1 "regression.h"`
	`20`	`+#line 1 "./../regression.h"`
`21`	`21`
`22`	`22`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include <stdlib.h>`
`14`	`14`	`#`
`15`	`15`
`16`		`-#line 1 "regression.h"`
	`16`	`+#line 1 "./../regression.h"`
`17`	`17`
`18`	`18`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#include <stdlib.h>`
`12`	`12`
`13`	`13`
`14`		`-#line 1 "regression.h"`
	`14`	`+#line 1 "./../regression.h"`
`15`	`15`
`16`	`16`
`17`	`17`