1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00

Applied Joachim's patch for a --regression option.

Made this option mark the .c files, so the environment variable is no longer needed.
Created a special MinGW file with the special error message.
Do not print port into log file when running regression tests.
This commit is contained in:
Michael Meskes
2007-01-11 15:47:34 +00:00
parent c0c00ac3b7
commit 5b88b85cad
50 changed files with 249 additions and 128 deletions

View File

@ -5,7 +5,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(LDFLAGS)
override LIBS := -lecpg -lpgtypes $(libpq) $(LIBS) $(PTHREAD_LIBS)
ECPG = ../../preproc/ecpg -I$(srcdir)/../../include
ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include
%: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -0,0 +1,83 @@
THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
[NO_PID]: ECPGdebug: set to 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGexecute line 23: QUERY: alter user connectuser encrypted password 'connectpw' on connection main
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGexecute line 23 Ok: ALTER ROLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port 55432 for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port 55432 for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database on localhost port 55432 for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: connect: could not open database nonexistant on localhost port 55432 for user connectuser in line 62
FATAL: database "nonexistant" does not exist
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection nonexistant closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -402 in line 62, 'Could not connect to database nonexistant in line 62.'.
[NO_PID]: sqlca: code: -402, state: 08001
[NO_PID]: raising sqlcode -220 in line 63, 'No such connection CURRENT in line 63.'.
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 20 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: connect: could not open database connectdb on localhost port 20 for user connectuser in line 66
could not connect to server: Connection refused (0x0000274D/10061)
Is the server running on host "localhost" and accepting
TCP/IP connections on port 20?
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -402 in line 66, 'Could not connect to database connectdb in line 66.'.
[NO_PID]: sqlca: code: -402, state: 08001
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000

View File

@ -1,7 +1,5 @@
THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,6 +1,3 @@
THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
[NO_PID]: ECPGdebug: set to 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
@ -19,45 +16,45 @@ THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port 55432 for user connectdb
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port 55432 for user connectdb
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <REGRESSION_PORT> for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection main closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database on localhost port 55432 for user connectdb
[NO_PID]: ECPGconnect: opening database on localhost port <REGRESSION_PORT> for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: Connection connectdb closed.
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: connect: could not open database nonexistant on localhost port 55432 for user connectuser in line 62
[NO_PID]: connect: could not open database nonexistant on localhost port <REGRESSION_PORT> for user connectuser in line 62
FATAL: database "nonexistant" does not exist
[NO_PID]: sqlca: code: 0, state: 00000
@ -67,9 +64,9 @@ THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
[NO_PID]: sqlca: code: -402, state: 08001
[NO_PID]: raising sqlcode -220 in line 63, 'No such connection CURRENT in line 63.'.
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: ECPGconnect: opening database connectdb on localhost port 20 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: connect: could not open database connectdb on localhost port 20 for user connectuser in line 66
[NO_PID]: connect: could not open database connectdb on localhost port <REGRESSION_PORT> for user connectuser in line 66
could not connect to server: Connection refused
Is the server running on host "localhost" and accepting
TCP/IP connections on port 20?
@ -79,5 +76,5 @@ THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -402 in line 66, 'Could not connect to database connectdb in line 66.'.
[NO_PID]: sqlca: code: -402, state: 08001
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port 55432 for user connectuser
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
[NO_PID]: sqlca: code: 0, state: 00000

View File

@ -1,3 +0,0 @@
THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,4 +1,5 @@
/* Processed by ecpg (4.3.1) */
/* Processed by ecpg (regression mode) */
int ecpg_internal_regression_mode = 1;
/* These include files are added by the preprocessor */
#include <ecpgtype.h>
#include <ecpglib.h>

View File

@ -1,5 +1,5 @@
#! /bin/sh
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.15 2006/09/26 07:56:56 meskes Exp $
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.16 2007/01/11 15:47:33 meskes Exp $
me=`basename $0`
@ -707,7 +707,7 @@ if [ $? -ne 0 ]; then
fi
# this variable prevents that the PID gets included in the logfiles
ECPG_REGRESSION=1; export ECPG_REGRESSION
#ECPG_REGRESSION=1; export ECPG_REGRESSION
LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
DIFFPRETTYFLAGS="$DIFFFLAGS -C3"
@ -753,19 +753,19 @@ for i in \
# so tweak output files and replace the port number (we put a warning
# but the price to pay is that we have to tweak the files every time
# now not only if the port differs from the standard port).
if [ "$i" = "connect/test1.pgc" ]; then
#if [ "$i" = "connect/test1.pgc" ]; then
# can we use sed -i on all platforms?
for f in "$outfile_stderr" "$outfile_stdout" "$outfile_source"; do
mv $f $f.tmp
echo >> $f
echo "THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT" >> $f
echo >> $f
# for f in "$outfile_stderr" "$outfile_stdout" "$outfile_source"; do
# mv $f $f.tmp
# echo >> $f
# echo "THE PORT NUMBER MIGHT HAVE BEEN CHANGED BY THE REGRESSION SCRIPT" >> $f
# echo >> $f
# MinGW could return such a line:
# "could not connect to server: Connection refused (0x0000274D/10061)"
cat $f.tmp | sed -e s,$PGPORT,55432,g | sed -e "s,could not connect to server: Connection refused (0x.*/.*),could not connect to server: Connection refused,g" >> $f
rm $f.tmp
done
fi
#cat $f.tmp | sed -e s,$PGPORT,55432,g | sed -e "s,could not connect to server: Connection refused (0x.*/.*),could not connect to server: Connection refused,g" >> $f
# rm $f.tmp
# done
#fi
mv "$outfile_source" "$outfile_source.tmp"
cat "$outfile_source.tmp" | sed -e 's,^\(#line [0-9]*\) ".*/\([^/]*\)",\1 "\2",' > "$outfile_source"