Second try committing the path changes.

31 files changed, 59 insertions, 55 deletions

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 cb51daaf0bf..76e321af153 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 74fcfc74a71..9ee19ace763 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 749f4bf56ae..53e39a008d7 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 d5c2c59ea43..12c34203fa5 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 "./../../include/sqlca.h"
+#line 1 "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 7f6e8db351d..82a3df9559f 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 bd27430f63b..d11a1c33373 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 05a6b062320..ab4c33def1a 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 9ac0fe0d25c..d56b1954c7c 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 "./../../include/sqlca.h"
+#line 1 "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 19cd5ce472b..337a5d8984b 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 731f203b60e..ce18b08bf89 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 32d24bedf48..5e4451a4c57 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 34388ebde23..ba15660f336 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 c546ee34251..0d085b140dd 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 "./../../include/sqlca.h"
+#line 1 "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 ed734e54497..0ce27f4596d 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 9df8b9b14d1..805f50f7e81 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 68fb3b9320c..e997a2ce4ef 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 3d7468678ce..df7a39898a4 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 7a80e7e48d3..88bb07925a9 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 "./../../include/sqlca.h"
+#line 1 "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 13ca096d9c7..8e144528728 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 "./../../include/sqlca.h"
+#line 1 "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 323977a0720..44cd13bedb3 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 "./../../include/sqlca.h"
+#line 1 "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 2ca755b3a0b..d1c776fca1d 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 227a313a364..77cfa52b199 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 "./../../include/sqlca.h"
+#line 1 "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 b2b83cf0c78..69d9446169a 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 "./../../include/sqlca.h"
+#line 1 "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 fea69b95359..5ecd7c65183 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 "./../../include/sql3types.h"
+#line 1 "sql3types.h"
 #ifndef _ECPG_SQL3TYPES_H
 #define _ECPG_SQL3TYPES_H
 
@@ -62,7 +62,7 @@ enum
 #line 7 "dyntest.pgc"
 
 
-#line 1 "./../../include/sqlca.h"
+#line 1 "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 0e960ea352c..6f8bf3a17fb 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 73a4eaef8e4..cc7054d4731 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 "./../../include/sqlca.h"
+#line 1 "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 9868fef9ab8..5c2dceb4d03 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 46fadb436a3..e5c906b45eb 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 0df8272907d..96be500f6f1 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 22a666f52e9..b2a95d54006 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"
 
 
 
diff --git a/src/interfaces/ecpg/test/pg_regress.sh b/src/interfaces/ecpg/test/pg_regress.sh
index d9d9f669450..c0cf3477cb5 100644
--- a/src/interfaces/ecpg/test/pg_regress.sh
+++ b/src/interfaces/ecpg/test/pg_regress.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.8 2006/08/29 12:24:51 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.9 2006/08/29 13:23:26 meskes Exp $
 
 me=`basename $0`
 
@@ -751,6 +751,10 @@ for i in \
 		done
 	fi
 
+	mv "$outfile_source" "$outfile_source.tmp"
+	cat "$outfile_source.tmp" | sed -e 's,^\(#line [0-9]*\) ".*/\([^/]*\)",\1 "\2",' > "$outfile_source"
+	rm "$outfile_source.tmp"
+
 	DIFFER=""
 	diff $DIFFFLAGS expected/$outprg.stderr "$outfile_stderr" > /dev/null 2>&1
 	if [ $? != 0 ]; then